Merge branch 'master' into debian
authorJameson Rollins <jrollins@finestructure.net>
Thu, 16 Dec 2010 20:57:14 +0000 (15:57 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Thu, 16 Dec 2010 20:57:14 +0000 (15:57 -0500)

Trivial merge