# HG changeset patch # User Matt Mackall # Date 1275407711 18000 # Node ID 1dd69d159e5c29366cfe5213934f2cfbb44fe372 # Parent 55226ceb0b2aff71c64869f8506ed1dd39770639# Parent 5ce1949be1e3bd7ee3443f494b038d018f498699 Merge with stable diff -r 55226ceb0b2a -r 1dd69d159e5c .hgsigs --- a/.hgsigs Tue Jun 01 10:54:57 2010 -0500 +++ b/.hgsigs Tue Jun 01 10:55:11 2010 -0500 @@ -22,3 +22,4 @@ 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 0 iEYEABECAAYFAku1IwIACgkQywK+sNU5EO9MjgCdHLVwkTZlNHxhcznZKBL1rjN+J7cAoLLWi9LTL6f/TgBaPSKOy1ublbaW 39f725929f0c48c5fb3b90c071fc3066012456ca 0 iEYEABECAAYFAkvclvsACgkQywK+sNU5EO9FSwCeL9i5x8ALW/LE5+lCX6MFEAe4MhwAn1ev5o6SX6GrNdDfKweiemfO2VBk fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 0 iEYEABECAAYFAkvsKTkACgkQywK+sNU5EO9qEACgiSiRGvTG2vXGJ65tUSOIYihTuFAAnRzRIqEVSw8M8/RGeUXRps0IzaCO +24fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy diff -r 55226ceb0b2a -r 1dd69d159e5c .hgtags --- a/.hgtags Tue Jun 01 10:54:57 2010 -0500 +++ b/.hgtags Tue Jun 01 10:55:11 2010 -0500 @@ -34,3 +34,4 @@ 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 1.5.1 39f725929f0c48c5fb3b90c071fc3066012456ca 1.5.2 fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 1.5.3 +24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4