Merge pull request #5 from nullsub/master
authortexane <texane@gmail.com>
Sun, 5 Jun 2011 17:14:10 +0000 (10:14 -0700)
committertexane <texane@gmail.com>
Sun, 5 Jun 2011 17:14:10 +0000 (10:14 -0700)
Compile on Ubuntu 10.10 and 11.04


Trivial merge