Merge branch 'master' into debian
authorJameson Rollins <jrollins@finestructure.net>
Sat, 30 Oct 2010 07:36:37 +0000 (03:36 -0400)
committerJameson Rollins <jrollins@finestructure.net>
Sat, 30 Oct 2010 07:36:37 +0000 (03:36 -0400)

Trivial merge