Commit be5a20c8d6bf9bfb39afc2bdfbdf506ba289bcf8

Con Kolivas 2013-04-06T02:29:21

Fix warnings.