d13944dffe
end this annoying conflict between dev and production. git-svn-id: https://samskivert.googlecode.com/svn/trunk@1313 6335cc39-0255-0410-8fd6-9bcaacd3b74c