Merge commit 'refs/pull/992/head' of git://github.com/gentoo/gentoo
authorJason Zaman <perfinion@gentoo.org>
Mon, 7 Mar 2016 07:59:35 +0000 (15:59 +0800)
committerJason Zaman <perfinion@gentoo.org>
Mon, 7 Mar 2016 08:00:39 +0000 (16:00 +0800)

Trivial merge