Merge branch 'branch-1.4' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 15 Jun 2014 23:47:41 +0000 (17:47 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 15 Jun 2014 23:47:41 +0000 (17:47 -0600)

Trivial merge