Merge changes from Bernt Hansen's org workflow document.