Commit 25e8b20169a6f6919ad49cf32220975ab96b35c8

Ben Straub 2012-10-18T15:35:03

Fix broken tests