# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1147653454 25200
# Node ID 2efa636eb411552bce3c36946e4b64f381b3d127
# Parent  7761597b5da3d3a4bbc090a8341f589d472c50f7# Parent  09ed44225571cf4fc05fac6388198542c03086c7
merge with crew.


diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -535,8 +535,12 @@ if os.name == 'nt':
 
     def os_rcpath():
         '''return default os-specific hgrc search path'''
-        return system_rcpath() + [os.path.join(os.path.expanduser('~'),
-                                               'mercurial.ini')]
+        path = system_rcpath()
+        path.append(os.path.join(os.path.expanduser('~'), 'mercurial.ini'))
+        userprofile = os.environ.get('USERPROFILE')
+        if userprofile:
+            path.append(os.path.join(userprofile, 'mercurial.ini'))
+        return path
 
     def parse_patch_output(output_line):
         """parses the output produced by patch and returns the file name"""