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

Trivial merge