Merge remote-tracking branch 'remotes/github/pr/194'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 16 Oct 2015 06:33:04 +0000 (06:33 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 16 Oct 2015 06:33:04 +0000 (06:33 +0000)

Trivial merge