[xemacs-packages-extra/f14/master: 23/23] Merge branch 'master' into f14

[Jerry James]

commit 5e7fc9ed5aa258ac93126f656eefe61a4a5b476e
Merge: 11bebc5 8e6cf66
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Aug 13 12:26:25 2010 -0600

    Merge branch 'master' into f14
    
    Conflicts:
    	xemacs-packages-extra.spec

 .gitignore                                         |    2 +-
 sources                                            |    2 +-
 xemacs-packages-extra-20090217-vc-menu.patch       |   69 -
 xemacs-packages-extra-20090624-apel-503185.patch   | 1497 ---------------
 xemacs-packages-extra-20090624-dired-504422.patch  |   25 -
 xemacs-packages-extra-20090824-timer.patch         |   38 -
 ...extra-20091103-ediff-coding-system-532620.patch | 2018 --------------------
 xemacs-packages-extra-checkout.sh                  |    6 +-
 xemacs-packages-extra.spec                         |   71 +-
 9 files changed, 33 insertions(+), 3695 deletions(-)
---