Merge branch 'master' into debian
authorJameson Rollins <jrollins@finestructure.net>
Mon, 4 Oct 2010 06:17:02 +0000 (02:17 -0400)
committerJameson Rollins <jrollins@finestructure.net>
Mon, 4 Oct 2010 06:17:02 +0000 (02:17 -0400)

Trivial merge