Merge branch 'master' into light-emacs
authorOlivier Tétard <otd@otd.amossys.fr>
Wed, 26 Aug 2009 08:10:48 +0000 (10:10 +0200)
committerOlivier Tétard <otd@otd.amossys.fr>
Wed, 26 Aug 2009 08:10:48 +0000 (10:10 +0200)
commit330d462077ceb2e532ab927ea1db50f47c0c6018
tree703f2690e161ed5ead9e196c7029dced92e02bf2
parent5427e9ab50258eb688a0ff3728ace205e691b53a
parentb89f9570d7ed638615e1c4df832d8f7516f0f77a
Merge branch 'master' into light-emacs

Conflicts:
emacs/emacs.el