Merge pull request #1100 from bmiklautz/fix_warnings
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Mar 2013 22:42:38 +0000 (15:42 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Mar 2013 22:42:38 +0000 (15:42 -0700)
Build and test fixes


Trivial merge