Merge remote-tracking branch 'remotes/github/pr/206'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 16 Oct 2015 07:37:37 +0000 (07:37 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 16 Oct 2015 07:46:10 +0000 (07:46 +0000)

Trivial merge