Merge -stable heads stable

Merge -stable heads

--- a/mercurial/subrepo.py	Mon Dec 14 22:09:49 2009 +0100
+++ b/mercurial/subrepo.py	Tue Dec 15 10:44:10 2009 -0600
@@ -160,6 +160,9 @@
         else:
             util.makedirs(root)
             self._repo = hg.repository(r.ui, root, create=True)
+            f = file(os.path.join(root, '.hg', 'hgrc'), 'w')
+            f.write('[paths]\ndefault = %s\n' % state[0])
+            f.close()
         self._repo._subparent = r
         self._repo._subsource = state[0]