# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1255466635 25200
# Node ID fbed59b61a1cd71b79c553f1873190951d0e0685
# Parent  17da88da1abd0ef4ff5c40e97d142182a513b831# Parent  a41f2840f9c605be0a931389b02e71932ee87372
Merge with mpm

diff -r 17da88da1abd -r fbed59b61a1c README
diff -r 17da88da1abd -r fbed59b61a1c mercurial/windows.py
diff -r 17da88da1abd -r fbed59b61a1c tests/test-gendoc.out
--- a/tests/test-gendoc.out	Mon Oct 12 18:25:46 2009 -0500
+++ b/tests/test-gendoc.out	Tue Oct 13 13:43:55 2009 -0700
@@ -23,6 +23,9 @@
 % extracting documentation from pt_BR
 checking for parse errors with rst2html
 
+% extracting documentation from sv
+checking for parse errors with rst2html
+
 % extracting documentation from zh_CN
 checking for parse errors with rst2html
 
diff -r 17da88da1abd -r fbed59b61a1c tests/test-import