Merge pull request #836 from madewokherd/buildfixes
authorZoltan Varga <vargaz@gmail.com>
Thu, 12 Dec 2013 21:49:54 +0000 (13:49 -0800)
committerZoltan Varga <vargaz@gmail.com>
Thu, 12 Dec 2013 21:49:54 +0000 (13:49 -0800)
various build fixes


Trivial merge