Commit 6183f0e2b2a42d6715f3d0d85fbc41d170328ad1

nulltoken 2012-06-07T14:55:24

merge: cleanup tests