Merge branch 'maint-1.6.2' into maint

diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox
index 85df55f2c43c9462f7bf36f0b3acf186b84d64b0..c5ad206b40e1fcf79019cebdfd848d72c17cefcc 100644 (file)
--- a/t/t5100/sample.mbox
+++ b/t/t5100/sample.mbox
@@ -2,10 +2,10 @@
        
     
 From nobody Mon Sep 17 00:00:00 2001
-From: A
+From: A (zzz)
       U
       Thor
-      <a.u.thor@example.com>
+      <a.u.thor@example.com> (Comment)
 Date: Fri, 9 Jun 2006 00:44:16 -0700
 Subject: [PATCH] a commit.