# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1218677797 18000
# Node ID 438e02b4be73ffd80d4a6cc45b7c9273d6b26604
# Parent  0642d9d7ec80a307e0c0bb7fa9c696155fc146da# Parent  ee1d26bcd7c2195b95d92b66fbc8c8bd96abdae4
Merge with stable

diff -r 0642d9d7ec80 -r 438e02b4be73 .hgsigs
--- a/.hgsigs	Wed Aug 13 20:18:44 2008 -0500
+++ b/.hgsigs	Wed Aug 13 20:36:37 2008 -0500
@@ -6,3 +6,4 @@
 23889160905a1b09fffe1c07378e9fc1827606eb 0 iD8DBQBHGTzoywK+sNU5EO8RAr/UAJ0Y8s4jQtzgS+G9vM8z6CWBThZ8fwCcCT5XDj2XwxKkz/0s6UELwjsO3LU=
 bae2e9c838e90a393bae3973a7850280413e091a 0 iD8DBQBH6DO5ywK+sNU5EO8RAsfrAJ0e4r9c9GF/MJsM7Xjd3NesLRC3+ACffj6+6HXdZf8cswAoFPO+DY00oD0=
 d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 0 iD8DBQBINdwsywK+sNU5EO8RAjIUAKCPmlFJSpsPAAUKF+iNHAwVnwmzeQCdEXrL27CWclXuUKdbQC8De7LICtE=
+d2375bbee6d47e62ba8e415c86e83a465dc4dce9 0 iD8DBQBIo1wpywK+sNU5EO8RAmRNAJ94x3OFt6blbqu/yBoypm/AJ44fuACfUaldXcV5z9tht97hSp22DVTEPGc=
diff -r 0642d9d7ec80 -r 438e02b4be73 .hgtags
--- a/.hgtags	Wed Aug 13 20:18:44 2008 -0500
+++ b/.hgtags	Wed Aug 13 20:36:37 2008 -0500
@@ -18,3 +18,4 @@
 23889160905a1b09fffe1c07378e9fc1827606eb 0.9.5
 bae2e9c838e90a393bae3973a7850280413e091a 1.0
 d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 1.0.1
+d2375bbee6d47e62ba8e415c86e83a465dc4dce9 1.0.2