Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
authorMike Pagano <mpagano@gentoo.org>
Mon, 10 Aug 2015 22:44:30 +0000 (18:44 -0400)
committerMike Pagano <mpagano@gentoo.org>
Mon, 10 Aug 2015 22:44:30 +0000 (18:44 -0400)

Trivial merge