Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Tue, 19 Jul 2011 12:48:43 +0000 (14:48 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 19 Jul 2011 12:48:43 +0000 (14:48 +0200)

Trivial merge