Merge remote-tracking branch 'remotes/github/pr/270'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 21 Oct 2015 06:47:52 +0000 (06:47 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 21 Oct 2015 06:49:34 +0000 (06:49 +0000)

Trivial merge