Merge pull request #1200 from ethomson/merge_cleanup merge cleanup should actually cleanup and the test should actually test
2013-01-06T18:56:40