Merge pull request #147 from bgamari/fixes
authorMichael Moon <triffid.hunter@gmail.com>
Thu, 7 Mar 2013 04:32:20 +0000 (20:32 -0800)
committerMichael Moon <triffid.hunter@gmail.com>
Thu, 7 Mar 2013 04:32:20 +0000 (20:32 -0800)
Fix various warnings


Trivial merge