Merge branch 'master' into debian
authorJameson Rollins <jrollins@finestructure.net>
Tue, 23 Mar 2010 06:51:56 +0000 (02:51 -0400)
committerJameson Rollins <jrollins@finestructure.net>
Tue, 23 Mar 2010 06:51:56 +0000 (02:51 -0400)

Trivial merge