Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage
authorFabian Groffen <grobian@gentoo.org>
Sat, 4 Sep 2010 18:08:53 +0000 (20:08 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sat, 4 Sep 2010 18:08:53 +0000 (20:08 +0200)

Trivial merge