updating
authorIan Delaney <idella4@gentoo.org>
Mon, 10 Aug 2015 05:32:35 +0000 (13:32 +0800)
committerIan Delaney <idella4@gentoo.org>
Mon, 10 Aug 2015 05:32:35 +0000 (13:32 +0800)
Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo


Trivial merge