Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sat, 31 Dec 2011 16:43:57 +0000 (17:43 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sat, 31 Dec 2011 16:43:57 +0000 (17:43 +0100)

Trivial merge