Merged pull request #91 from skolima/master.
authorMarek Habersack <grendel@twistedcode.net>
Thu, 28 Apr 2011 12:52:01 +0000 (05:52 -0700)
committerMarek Habersack <grendel@twistedcode.net>
Thu, 28 Apr 2011 12:52:01 +0000 (05:52 -0700)
Fix the build that I broke


Trivial merge