Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
authorAaron W. Swenson <titanofold@gentoo.org>
Wed, 9 Dec 2015 12:44:49 +0000 (07:44 -0500)
committerAaron W. Swenson <titanofold@gentoo.org>
Wed, 9 Dec 2015 12:51:42 +0000 (07:51 -0500)

Trivial merge