# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1220359728 14400
# Node ID b741dc506a4c578bfc75caa69be055da7720de76
# Parent  b395cf3c0d0a64bf45d5e895209bb0b1a9ad4913# Parent  6a75bd9be8ef674b959920e7f2183c1ea3d0ec27
Merge with stable

diff -r b395cf3c0d0a -r b741dc506a4c tests/test-keyword.out
--- a/tests/test-keyword.out	Sun Aug 24 23:44:52 2008 +0200
+++ b/tests/test-keyword.out	Tue Sep 02 08:48:48 2008 -0400
@@ -394,10 +394,10 @@
 200 Script output follows
 
 
-User Name <user@example.com>@1: expand $Id$
-User Name <user@example.com>@1: do not process $Id:
-User Name <user@example.com>@1: xxx $
-User Name <user@example.com>@2: $Xinfo$
+user@1: expand $Id$
+user@1: do not process $Id:
+user@1: xxx $
+user@2: $Xinfo$