Merge remote-tracking branch 'remotes/github/pr/157'.
authorPatrice Clement <monsieurp@gentoo.org>
Thu, 8 Oct 2015 09:04:51 +0000 (09:04 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Thu, 8 Oct 2015 09:04:51 +0000 (09:04 +0000)

Trivial merge