Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
authorIan Delaney <idella4@gentoo.org>
Mon, 10 Aug 2015 03:11:44 +0000 (11:11 +0800)
committerIan Delaney <idella4@gentoo.org>
Mon, 10 Aug 2015 03:11:44 +0000 (11:11 +0800)

Trivial merge