Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Sun, 30 Jan 2011 21:21:43 +0000 (22:21 +0100)
committerFabian Groffen <grobian@gentoo.org>
Sun, 30 Jan 2011 21:21:43 +0000 (22:21 +0100)

Trivial merge