merge with -stable

merge with -stable

--- a/tests/test-acl	Fri Dec 12 12:34:57 2008 -0800
+++ b/tests/test-acl	Sat Dec 13 13:28:20 2008 +0100
@@ -14,7 +14,11 @@
 	cat acl.config
 	echo '"""'
     fi
-    LOGNAME=$user hg --cwd a --debug push ../b
+    # On AIX /etc/profile sets LOGNAME read-only. So
+    #  LOGNAME=$user hg --cws a --debug push ../b
+    # fails with "This variable is read only."
+    # Use env to work around this.
+    env LOGNAME=$user hg --cwd a --debug push ../b
     hg --cwd b rollback
     hg --cwd b --quiet tip
     echo