# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1259719831 21600
# Node ID ad0a5fb627e67d1f6d0d073c1f7d0b1503612c2c
# Parent  279282ca42f0cb4e2abf7793c79d04ae25f8befd# Parent  ed290e503b8af5b30f5bed9f7d6a2ad91723d07e
Merge with stable

diff -r 279282ca42f0 -r ad0a5fb627e6 .hgsigs
--- a/.hgsigs	Tue Dec 01 19:30:30 2009 -0600
+++ b/.hgsigs	Tue Dec 01 20:10:31 2009 -0600
@@ -15,3 +15,4 @@
 196d40e7c885fa6e95f89134809b3ec7bdbca34b 0 iEYEABECAAYFAkpL2X4ACgkQywK+sNU5EO9FOwCfXJycjyKJXsvQqKkHrglwOQhEKS4An36GfKzptfN8b1qNc3+ya/5c2WOM
 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 0 iEYEABECAAYFAkpopLIACgkQywK+sNU5EO8QSgCfZ0ztsd071rOa2lhmp9Fyue/WoI0AoLTei80/xrhRlB8L/rZEf2KBl8dA
 31ec469f9b556f11819937cf68ee53f2be927ebf 0 iEYEABECAAYFAksBuxAACgkQywK+sNU5EO+mBwCfagB+A0txzWZ6dRpug3LEoK7Z1QsAoKpbk8vsLjv6/oRDicSk/qBu33+m
+439d7ea6fe3aa4ab9ec274a68846779153789de9 0 iEYEABECAAYFAksVw0kACgkQywK+sNU5EO/oZwCfdfBEkgp38xq6wN2F4nj+SzofrJIAnjmxt04vaJSeOOeHylHvk6lzuQsw
diff -r 279282ca42f0 -r ad0a5fb627e6 .hgtags
--- a/.hgtags	Tue Dec 01 19:30:30 2009 -0600
+++ b/.hgtags	Tue Dec 01 20:10:31 2009 -0600
@@ -27,3 +27,4 @@
 196d40e7c885fa6e95f89134809b3ec7bdbca34b 1.3
 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 1.3.1
 31ec469f9b556f11819937cf68ee53f2be927ebf 1.4
+439d7ea6fe3aa4ab9ec274a68846779153789de9 1.4.1