Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 1 May 2010 12:00:13 +0000 (14:00 +0200)
committerFabian Groffen <grobian@gentoo.org>
Sat, 1 May 2010 12:00:13 +0000 (14:00 +0200)

Trivial merge