# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1276098645 -7200
# Node ID c34dcc085da6abe1d0a9612c20eb44f363983af1
# Parent  0bb14798cd078bb06c22b33470cefa9e3c8d848b# Parent  3f1409082720914b768b76d889702884d55e8862
Merge with mpm

diff -r 3f1409082720 -r c34dcc085da6 mercurial/discovery.py
--- a/mercurial/discovery.py	Tue Jun 08 15:57:59 2010 -0500
+++ b/mercurial/discovery.py	Wed Jun 09 17:50:45 2010 +0200
@@ -1,6 +1,6 @@
-# localrepo.py - read/write repository class for mercurial
+# discovery.py - protocol changeset discovery functions
 #
-# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
+# Copyright 2010 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.