jwiegley/org-mode — pull request #2 by dabrahams (2012-03-12 20:06:36+00:00)
Title: This is a simple upstream merge

Maybe it saves you a little labor.