Fix package precedence problem where single-version eggs installed in

``site-packages`` would take precedence over ``.egg`` files (or
directories) installed in ``site-packages``.
(backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4057944

pkg_resources.py

@@ -2230,7 +2230,8 @@ class Distribution(object):
         for p, item in enumerate(npath):
             if item==nloc:
                 break
-            elif item==bdir:
+            elif item==bdir and self.precedence==EGG_DIST:
+                # if it's an .egg, give it precedence over its directory
                 path.insert(p, loc)
                 npath.insert(p, nloc)
                 break
@@ -2252,7 +2253,6 @@ class Distribution(object):
 
 
 
-
     def check_version_conflict(self):
         if self.key=='setuptools':
             return      # ignore the inevitable setuptools self-conflicts  :(

pkg_resources.txt

@@ -1692,6 +1692,11 @@ File/Path Utilities
 Release Notes/Change History
 ----------------------------
 
+0.6c7
+ * Fix package precedence problem where single-version eggs installed in
+   ``site-packages`` would take precedence over ``.egg`` files (or directories)
+   installed in ``site-packages``.
+   
 0.6c6
  * Fix extracted C extensions not having executable permissions under Cygwin.