From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 23 Apr 2012 19:21:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20284dc0435e5d586bd52774aa0993c369282a19;p=portage.git

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/dohtml.py
	bin/misc-functions.sh
---

20284dc0435e5d586bd52774aa0993c369282a19
diff --cc bin/misc-functions.sh
index 0d60a51e7,4e81ddf57..a7a18e23f
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh