Commit c31ae146b4fec2220db981465f2bde221fec1f72

Edward Thomson 2013-01-06T18:38:29

merge cleanup should actually cleanup and the test should actually test