Merge branch 'master' of orgmode.org:org-mode
authorBastien Guerry <bzg@altern.org>
Sun, 11 Dec 2011 12:53:23 +0000 (13:53 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 11 Dec 2011 12:53:23 +0000 (13:53 +0100)

Trivial merge