Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 19:26:15 +0000 (21:26 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sun, 5 Sep 2010 19:26:15 +0000 (21:26 +0200)

Trivial merge