Merge pull request #5 from olerem/buildfixes
authorAdrian Chadd <adrian.chadd@gmail.com>
Fri, 5 Apr 2013 17:28:39 +0000 (10:28 -0700)
committerAdrian Chadd <adrian.chadd@gmail.com>
Fri, 5 Apr 2013 17:28:39 +0000 (10:28 -0700)
Buildfixes part 2


Trivial merge