# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1186213701 -7200
# Node ID 0f594cc36aedfecf8941ad81fec730d3307e015f
# Parent  2ef14e29e538a9ae1a89221b63d21b6d61331d50# Parent  a49f2a4d5ff73dfde8e4d18a0f59f7f63c801504
merge with crew-stable

diff --git a/mercurial/commands.py b/mercurial/commands.py
diff --git a/tests/test-archive b/tests/test-archive
diff --git a/tests/test-archive.out b/tests/test-archive.out