Merge branch 'pull-469'
authorIan Delaney <idella4@gentoo.org>
Mon, 14 Dec 2015 15:31:51 +0000 (23:31 +0800)
committerIan Delaney <idella4@gentoo.org>
Mon, 14 Dec 2015 15:33:29 +0000 (23:33 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/469


Trivial merge