Commit 039db728f3a0477129e664f0fd8c08316a9e8b62

Edward Thomson 2013-07-03T01:00:45

merge branch into current, updating workdir