# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1325448384 21600
# Node ID d730f8608b3a195d9eeecdcff9c378aba7948897
# Parent  6568a8649ed90039043bd8b1a0a54946c0560027# Parent  c8ea040bc1afb37c1bd74ba0d182d5fe0082a6fe
merge with stable

diff -r 6568a8649ed9 -r d730f8608b3a .hgsigs
--- a/.hgsigs	Sun Jan 01 14:05:03 2012 -0600
+++ b/.hgsigs	Sun Jan 01 14:06:24 2012 -0600
@@ -46,3 +46,4 @@
 384082750f2c51dc917d85a7145748330fa6ef4d 0 iD8DBQBOmd+OywK+sNU5EO8RAgDgAJ9V/X+G7VLwhTpHrZNiOHabzSyzYQCdE2kKfIevJUYB9QLAWCWP6DPwrwI=
 41453d55b481ddfcc1dacb445179649e24ca861d 0 iD8DBQBOsFhpywK+sNU5EO8RAqM6AKCyfxUae3/zLuiLdQz+JR78690eMACfQ6JTBQib4AbE+rUDdkeFYg9K/+4=
 195dbd1cef0c2f9f8bcf4ea303238105f716bda3 0 iD8DBQBO1/fWywK+sNU5EO8RAmoPAKCR5lpv1D6JLURHD8KVLSV4GRVEBgCgnd0Sy78ligNfqAMafmACRDvj7vo=
+6344043924497cd06d781d9014c66802285072e4 0 iD8DBQBPALgmywK+sNU5EO8RAlfhAJ9nYOdWnhfVDHYtDTJAyJtXBAQS9wCgnefoSQt7QABkbGxM+Q85UYEBuD0=
diff -r 6568a8649ed9 -r d730f8608b3a .hgtags
--- a/.hgtags	Sun Jan 01 14:05:03 2012 -0600
+++ b/.hgtags	Sun Jan 01 14:06:24 2012 -0600
@@ -58,3 +58,4 @@
 384082750f2c51dc917d85a7145748330fa6ef4d 2.0-rc
 41453d55b481ddfcc1dacb445179649e24ca861d 2.0
 195dbd1cef0c2f9f8bcf4ea303238105f716bda3 2.0.1
+6344043924497cd06d781d9014c66802285072e4 2.0.2