merge with stable

merge with stable

--- a/tests/test-largefiles-cache.t	Thu Nov 10 15:55:26 2011 -0600
+++ b/tests/test-largefiles-cache.t	Thu Nov 10 17:06:30 2011 -0600
@@ -22,7 +22,7 @@
 
   $ rm -rf ${USERCACHE}
 
-Create mirror repo, and pull from source without largefile: 
+Create mirror repo, and pull from source without largefile:
 "pull" is used instead of "clone" for suppression of (1) updating to
 tip (= cahcing largefile from source repo), and (2) recording source
 repo as "default" path in .hg/hgrc.