From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 12 Sep 2012 18:17:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f0397094c2ed8fe67b96cbc797da99aaac335cca;p=portage.git

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

Conflicts:
	pym/portage/data.py
---

f0397094c2ed8fe67b96cbc797da99aaac335cca
diff --cc pym/portage/data.py
index 23734f4ea,b922ff8e9..df87b5c81
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@@ -1,9 -1,8 +1,9 @@@
  # data.py -- Calculated/Discovered Data Values
- # Copyright 1998-2011 Gentoo Foundation
+ # Copyright 1998-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
- import os, pwd, grp, platform
+ import os, pwd, grp, platform, sys
 +from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME, EPREFIX
  
  import portage
  portage.proxy.lazyimport.lazyimport(globals(),