merge with stable

merge with stable

--- a/mercurial/win32.py	Fri Jan 21 16:26:01 2011 -0600
+++ b/mercurial/win32.py	Sat Jan 22 09:13:04 2011 -0600
@@ -170,6 +170,8 @@
     try:
         # Query stderr to avoid problems with redirections
         screenbuf = win32console.GetStdHandle(win32console.STD_ERROR_HANDLE)
+        if screenbuf is None:
+            return 79
         try:
             window = screenbuf.GetConsoleScreenBufferInfo()['Window']
             width = window.Right - window.Left