Merge commit 'refs/pull/926/head' of git://github.com/gentoo/gentoo
authorJason Zaman <perfinion@gentoo.org>
Tue, 1 Mar 2016 17:09:43 +0000 (01:09 +0800)
committerJason Zaman <perfinion@gentoo.org>
Tue, 1 Mar 2016 17:11:54 +0000 (01:11 +0800)

Trivial merge