Merge with stable

Merge with stable

--- a/mercurial/context.py	Thu Aug 02 01:49:36 2012 -0500
+++ b/mercurial/context.py	Thu Aug 02 18:33:40 2012 +0200
@@ -885,8 +885,7 @@
         p = self._repo.dirstate.parents()
         if p[1] == nullid:
             p = p[:-1]
-        self._parents = [changectx(self._repo, x) for x in p]
-        return self._parents
+        return [changectx(self._repo, x) for x in p]
 
     def status(self, ignored=False, clean=False, unknown=False):
         """Explicit status query