Merge remote-tracking branch 'remotes/github/pr/120'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 23 Sep 2015 10:00:47 +0000 (10:00 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 23 Sep 2015 10:01:47 +0000 (10:01 +0000)

Trivial merge