Merge branch 'master' of orgmode.org:worg
authorNick Dokos <nicholas.dokos@hp.com>
Wed, 11 Apr 2012 21:10:17 +0000 (17:10 -0400)
committerNick Dokos <nicholas.dokos@hp.com>
Wed, 11 Apr 2012 21:10:17 +0000 (17:10 -0400)

Trivial merge