Merge remote branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Mon, 5 Apr 2010 17:44:39 +0000 (19:44 +0200)
committerFabian Groffen <grobian@gentoo.org>
Mon, 5 Apr 2010 17:44:39 +0000 (19:44 +0200)

Trivial merge