Merge pull request #5 from ramonvanalteren/master
authorSalim Fadhley <sal@stodge.org>
Wed, 15 Feb 2012 00:25:12 +0000 (16:25 -0800)
committerSalim Fadhley <sal@stodge.org>
Wed, 15 Feb 2012 00:25:12 +0000 (16:25 -0800)
as requested


Trivial merge