Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
authorFabian Groffen <grobian@gentoo.org>
Thu, 20 Oct 2011 20:28:26 +0000 (22:28 +0200)
committerFabian Groffen <grobian@gentoo.org>
Thu, 20 Oct 2011 20:28:26 +0000 (22:28 +0200)

Trivial merge