Merge commit 'refs/pull/1039/head' of git://github.com/gentoo/gentoo
authorJason Zaman <perfinion@gentoo.org>
Mon, 14 Mar 2016 04:30:34 +0000 (12:30 +0800)
committerJason Zaman <perfinion@gentoo.org>
Mon, 14 Mar 2016 04:30:34 +0000 (12:30 +0800)

Trivial merge