# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1368107502 14400
# Node ID c9431c711ddb3c7906eb1f62f00e774688e3e0a6
# Parent  113681bbef9e787eac56cf1d2049778a83ce124e# Parent  ed1a212193dc237edc350330146128a13641e38f
Merge with stable.

diff -r 113681bbef9e -r c9431c711ddb mercurial/subrepo.py
--- a/mercurial/subrepo.py	Wed May 08 14:11:01 2013 -0700
+++ b/mercurial/subrepo.py	Thu May 09 09:51:42 2013 -0400
@@ -31,7 +31,7 @@
 def _calcfilehash(filename):
     data = ''
     if os.path.exists(filename):
-        fd = open(filename)
+        fd = open(filename, 'rb')
         data = fd.read()
         fd.close()
     return util.sha1(data).hexdigest()