Merge pull request #1 from jeremyroman/master
authorMichael Spang <mspang@csclub.uwaterloo.ca>
Thu, 15 Mar 2012 00:47:18 +0000 (17:47 -0700)
committerMichael Spang <mspang@csclub.uwaterloo.ca>
Thu, 15 Mar 2012 00:47:18 +0000 (17:47 -0700)
Build on Ubuntu oneiric


Trivial merge