Merge branch 'branch-1.1' into debian debian/1.1-1
authorBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 21:40:45 +0000 (15:40 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 21:40:45 +0000 (15:40 -0600)

Trivial merge