Merge branch 'master' of orgmode.org:worg
authorNick Dokos <nicholas.dokos@hp.com>
Sat, 31 Dec 2011 16:29:01 +0000 (11:29 -0500)
committerNick Dokos <nicholas.dokos@hp.com>
Sat, 31 Dec 2011 16:29:01 +0000 (11:29 -0500)

Trivial merge