Merge branch 'branch-1.5' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 07:33:59 +0000 (01:33 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 07:33:59 +0000 (01:33 -0600)

Trivial merge