# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1338669353 18000
# Node ID 7b460b49bf7b75c5a4ab444915c52802c9f97f33
# Parent  357e6bcfb61973478bfbe4cf5652026a6bda7ef7# Parent  f61c86d43b70c9a15c712b0ffc8dea642e38e973
merge with stable

diff -r 357e6bcfb619 -r 7b460b49bf7b .hgsigs
--- a/.hgsigs	Fri Jun 01 23:44:10 2012 -0500
+++ b/.hgsigs	Sat Jun 02 15:35:53 2012 -0500
@@ -54,3 +54,4 @@
 d9e2f09d5488c395ae9ddbb320ceacd24757e055 0 iD8DBQBPju/dywK+sNU5EO8RArBYAJ9xtifdbk+hCOJO8OZa4JfHX8OYZQCeKPMBaBWiT8N/WHoOm1XU0q+iono=
 00182b3d087909e3c3ae44761efecdde8f319ef3 0 iD8DBQBPoFhIywK+sNU5EO8RAhzhAKCBj1n2jxPTkZNJJ5pSp3soa+XHIgCgsZZpAQxOpXwCp0eCdNGe0+pmxmg=
 5983de86462c5a9f42a3ad0f5e90ce5b1d221d25 0 iD8DBQBPovNWywK+sNU5EO8RAhgiAJ980T91FdPTRMmVONDhpkMsZwVIMACgg3bKvoWSeuCW28llUhAJtUjrMv0=
+85a358df5bbbe404ca25730c9c459b34263441dc 0 iD8DBQBPyZsWywK+sNU5EO8RAnpLAJ48qrGDJRT+pteS0mSQ11haqHstPwCdG4ccGbk+0JHb7aNy8/NRGAOqn9w=
diff -r 357e6bcfb619 -r 7b460b49bf7b .hgtags
--- a/.hgtags	Fri Jun 01 23:44:10 2012 -0500
+++ b/.hgtags	Sat Jun 02 15:35:53 2012 -0500
@@ -66,3 +66,4 @@
 d9e2f09d5488c395ae9ddbb320ceacd24757e055 2.2-rc
 00182b3d087909e3c3ae44761efecdde8f319ef3 2.2
 5983de86462c5a9f42a3ad0f5e90ce5b1d221d25 2.2.1
+85a358df5bbbe404ca25730c9c459b34263441dc 2.2.2