Merge branch 'maint-1.6.4' into maint

diff --git a/t/t9603/cvsroot/module/b,v b/t/t9603/cvsroot/module/b,v
index ab3089fe560c0cd621642d3fc4efc866f3f57dce..d26885518a25dab59db26860b823d09a85559183 100644 (file)
--- a/t/t9603/cvsroot/module/b,v
+++ b/t/t9603/cvsroot/module/b,v
@@ -1,13 +1,20 @@
-head   1.2;
+head   1.3;
 access;
-symbols;
+symbols
+       A:1.2.0.2;
 locks; strict;
 comment        @# @;
 
 
+1.3
+date   2009.03.11.19.05.08;    author tester;  state Exp;
+branches;
+next   1.2;
+
 1.2
 date   2009.02.21.18.11.43;    author tester;  state Exp;
-branches;
+branches
+       1.2.2.1;
 next   1.1;
 
 1.1
@@ -15,17 +22,60 @@ date        2009.02.21.18.11.14;    author tester;  state Exp;
 branches;
 next   ;
 
+1.2.2.1
+date   2009.03.11.19.03.52;    author tester;  state Exp;
+branches;
+next   1.2.2.2;
+
+1.2.2.2
+date   2009.03.11.19.09.10;    author tester;  state Exp;
+branches;
+next   ;
+
 
 desc
 @@
 
 
+1.3
+log
+@Rev 4
+@
+text
+@1.3
+@
+
+
 1.2
 log
 @Rev 3
 @
 text
-@1.2
+@d1 1
+a1 1
+1.2
+@
+
+
+1.2.2.1
+log
+@Rev 4 Branch A
+@
+text
+@d1 1
+a1 1
+1.2.2.1
+@
+
+
+1.2.2.2
+log
+@Rev 5 Branch A
+@
+text
+@d1 1
+a1 1
+1.2
 @