Merge branch 'upstream' into debian
authorJameson Graef Rollins <jrollins@finestructure.net>
Sun, 20 Dec 2009 16:03:19 +0000 (11:03 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sun, 20 Dec 2009 16:03:19 +0000 (11:03 -0500)

Trivial merge