Merge branch 'master' of orgmode.org:worg
authorNick Dokos <nicholas.dokos@hp.com>
Tue, 5 Jun 2012 18:23:20 +0000 (14:23 -0400)
committerNick Dokos <nicholas.dokos@hp.com>
Tue, 5 Jun 2012 18:23:20 +0000 (14:23 -0400)

Trivial merge