Merge pull request #13 from olerem/buildfixes
authorAdrian Chadd <adrian.chadd@gmail.com>
Wed, 10 Apr 2013 08:24:10 +0000 (01:24 -0700)
committerAdrian Chadd <adrian.chadd@gmail.com>
Wed, 10 Apr 2013 08:24:10 +0000 (01:24 -0700)
Buildfixes part4v2


Trivial merge