Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Thu, 21 Jul 2011 10:28:43 +0000 (12:28 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 21 Jul 2011 10:28:43 +0000 (12:28 +0200)

Trivial merge