Merge branch 'master' into debian
authorJameson Rollins <jrollins@finestructure.net>
Wed, 6 Oct 2010 21:41:47 +0000 (17:41 -0400)
committerJameson Rollins <jrollins@finestructure.net>
Wed, 6 Oct 2010 21:41:47 +0000 (17:41 -0400)

Trivial merge