Merge remote-tracking branch 'remotes/github/pr/269'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 21 Oct 2015 06:54:56 +0000 (06:54 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 21 Oct 2015 06:54:56 +0000 (06:54 +0000)

Trivial merge