Merge branch 'branch-1.1' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 16 Sep 2012 20:01:51 +0000 (14:01 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Sep 2012 20:01:51 +0000 (14:01 -0600)

Trivial merge