Removed spurious UserWarnings. Fixes #134

--HG--
branch : distribute
extra : rebase_source : be9d958a083e556228597d044267d7e15a826649

CHANGES.txt

@@ -15,6 +15,7 @@ CHANGES
 * Issue 133: Added --no-find-links to easy_install
 * Added easy_install --user
 * Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account
+* Issue 134: removed spurious UserWarnings. Patch by VanLindberg
 
 ------
 0.6.10

pkg_resources.py

@@ -2332,7 +2332,8 @@ class Distribution(object):
             if modname in ('pkg_resources', 'setuptools', 'site'):
                 continue
             fn = getattr(sys.modules[modname], '__file__', None)
-            if fn and normalize_path(fn).startswith(loc):
+            if fn and (normalize_path(fn).startswith(loc) or
+                       fn.startswith(self.location)):
                 continue
             issue_warning(
                 "Module %s was already imported from %s, but %s is being added"