Merge remote-tracking branch 'remotes/github/pr/121'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 23 Sep 2015 09:13:49 +0000 (09:13 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 23 Sep 2015 09:13:49 +0000 (09:13 +0000)

Trivial merge