Merge remote-tracking branch 'remotes/github/pr/134' courtesy of William L. Thomson...
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 26 Sep 2015 08:11:55 +0000 (08:11 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 26 Sep 2015 08:12:51 +0000 (08:12 +0000)

Trivial merge