Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
authorFabian Groffen <grobian@gentoo.org>
Thu, 20 Oct 2011 20:40:06 +0000 (22:40 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 20 Oct 2011 20:40:06 +0000 (22:40 +0200)

Trivial merge