# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1254981586 18000
# Node ID f0417b6ff98a995a15cecea6c39d50ebfafb94a0
# Parent  3e698434b990df03e7915c5c5ebf9925fa39d34b# Parent  e151b66bcf38b9ec5682ddd4cfda6b687c8f3c66
Merge with -stable

diff -r 3e698434b990 -r f0417b6ff98a mercurial/util.py
--- a/mercurial/util.py	Wed Oct 07 14:01:20 2009 -0500
+++ b/mercurial/util.py	Thu Oct 08 00:59:46 2009 -0500
@@ -1221,6 +1221,11 @@
                 return array.array('h', arri)[1]
             except ValueError:
                 pass
+            except IOError, e: 
+                if e[0] == errno.EINVAL: 
+                    pass 
+                else: 
+                    raise 
     except ImportError:
         pass
     return 80