Merge from trunk

This commit is contained in:
Stefan Monnier 2010-09-13 16:40:48 +02:00
commit cc390e46c7
734 changed files with 18782 additions and 15606 deletions

View file

@ -7,6 +7,7 @@
;; Hallvard Furuseth <hbf@ulrik.uio.no>
;; Maintainer: FSF
;; Keywords: internal
;; Package: emacs
;; This file is part of GNU Emacs.