Merge branch 'branch-1.1' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 03:29:17 +0000 (21:29 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 03:29:17 +0000 (21:29 -0600)

Trivial merge