From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 18 Sep 2010 10:45:32 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a6399eeab533438e291784696afe6a993bae45f1;p=portage.git

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

Conflicts:
	pym/portage/dbapi/vartree.py
---

a6399eeab533438e291784696afe6a993bae45f1