# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1259494053 0
# Node ID dead519e4ec647aca5ebd5098037834635c8da59
# Parent  25e813ce68e27033b53e000f855b419666e88da2# Parent  06ccaeb6cfc15849da11a0873200dc50a54bffeb
Merge with stable

diff -r 25e813ce68e2 -r dead519e4ec6 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Nov 26 10:51:17 2009 +0100
+++ b/hgkw/keyword.py	Sun Nov 29 11:27:33 2009 +0000
@@ -112,7 +112,8 @@
         'Author': '{author|user}',
         'Date': '{date|utcdate}',
         'RCSfile': '{file|basename},v',
-        'RCSFile': '{file|basename},v', # kept only for backwards compatibility
+        'RCSFile': '{file|basename},v', # kept for backwards compatibility
+                                        # with hg-keyword
         'Source': '{root}/{file},v',
         'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}',
         'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',