Merge pull request #23 from warped-rudi/master-updates
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 19 Sep 2012 00:54:22 +0000 (17:54 -0700)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 19 Sep 2012 00:54:22 +0000 (17:54 -0700)
Merged. Thanks!


Trivial merge