Merge branch 'master' of git://orgmode.org/org-mode into kit-changes
Merge branch 'kit-changes' of github.com:kitchoi/org-mode into kit-changes