master updated (21b7165 -> 7f690a4)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  21b7165   Remove Emacs 22 compat code from ediff-vers.el
       new  e07a751   ; * lisp/htmlfontify.el: Minor fix in file headers.
       new  d1545e2   Remove Emacs 22 compat code from abbrev.el
       new  7f690a4   Remove some compat code from CEDET


Summary of changes:
 lisp/abbrev.el           |  6 +-----
 lisp/cedet/data-debug.el | 38 +++++++++++++++++++-------------------
 lisp/htmlfontify.el      |  3 ---
 3 files changed, 20 insertions(+), 27 deletions(-)