# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1263978876 -3600
# Node ID 56bc2e01e08ea1136f85bff5b6298a9dbfc75575
# Parent  80d0ed025a02fdb94b1cf00f242d2cfd2fcfefb9# Parent  0efa9d6ac11f08e8dcb6b2e58c466bfe4e652907
Merge with stable

diff -r 80d0ed025a02 -r 56bc2e01e08e hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Dec 24 10:14:36 2009 +0000
+++ b/hgkw/keyword.py	Wed Jan 20 10:14:36 2010 +0100
@@ -3,7 +3,7 @@
 # Copyright 2007-2009 Christian Ebert <blacktrash@gmx.net>
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
 #
 # $Id$
 #
diff -r 80d0ed025a02 -r 56bc2e01e08e tests/run-tests.py
--- a/tests/run-tests.py	Thu Dec 24 10:14:36 2009 +0000
+++ b/tests/run-tests.py	Wed Jan 20 10:14:36 2010 +0100
@@ -5,7 +5,7 @@
 # Copyright 2006 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms of the
-# GNU General Public License version 2, incorporated herein by reference.
+# GNU General Public License version 2 or any later version.
 
 # Modifying this script is tricky because it has many modes:
 #   - serial (default) vs parallel (-jN, N > 1)