Merge remote-tracking branch 'remotes/dryatu/master'
authorIan Delaney <idella4@gentoo.org>
Fri, 1 Jan 2016 00:05:56 +0000 (08:05 +0800)
committerIan Delaney <idella4@gentoo.org>
Fri, 1 Jan 2016 00:06:56 +0000 (08:06 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/583


Trivial merge