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

Trivial merge