Merge pull request #21 from olerem/buildfixes
authorAdrian Chadd <adrian.chadd@gmail.com>
Thu, 25 Apr 2013 22:54:00 +0000 (15:54 -0700)
committerAdrian Chadd <adrian.chadd@gmail.com>
Thu, 25 Apr 2013 22:54:00 +0000 (15:54 -0700)
Buildfixes, final pull


Trivial merge