Merge tags from 2.5.

diff --cc .hgtags
index 12b66fa0f4ef4979f498bae234a8ee071d1333e5,112ac969cbcb4e041d38264d927a83696bbc997d..2fd5ff63536f570af6a708d39a93c0dc49124a7c
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -59,26 -99,16 +99,39 @@@ f3f1f1462c82536bb23796e70c85522144ee24d
  d49b198f545cd82fbf735a22979c332b8a97eecb v2.5b1
  03b6fe57cd6df5bb34ca19f4b760b943186cc806 v2.5b2
  c0abb18299b442e1160d2f958bce18f66850caa9 v2.5b3
+ 2dc64d570e8d7a4498ab850108c85709c276df93 v2.5c1
+ cc3cb3a8237ea545db917d84c49d8a0a5e175cc1 v2.5c2
+ c10a71cf16e471425e6d7564e3f7a648f14b702e v2.5
+ 4777c4007b5b194423953d41b1e5e6adaaba6c5d v2.5.1c1
+ 490d8c09abcb814950be7bb7a25c3ff2047c7eb5 v2.5.1
+ 0a8aae575cdddbf3d133fcb4eed91080e3fe41f3 v2.5.2c1
+ 1d508bbbdb49a2b11629ee186a63928291b08694 v2.5.2
+ 9530d334d2624219e7ee1aecaf33532e910266bc v2.5.3c1
+ 3cc056d21c2f4435a534d23345bad9c0a9d9b3cb v2.5.3
+ a0a6d9909312ad9c1d844af66e9c91931b93852a v2.5.4
+ 657f16582943739b906f66f7efad4014492c8b1c v2.5.5c1
+ 1dc91e9dd5c13a4bc2d3bb7d4b5896ab264f2325 v2.5.5c2
+ 7098a46f0b75e5aacfaf81d65d72e3613b023532 v2.5.5
 +2d0bd095c420b0711000d9be66848f6cfd972b3b v2.6a1
 +eec144917a189be11ed5efa35c6604d03bc62bcc v2.6a2
 +48e9fb0a721799877f26edaef01ac6e6029b6812 v2.6a3
 +2f2f32af8c4ee8f6598f632dc83701a20726d10a v2.6b1
 +81ec8263bd6e25c9a8855cd0ce9ae881732972be v2.6b2
 +c62862d73f9ec64d655494cf1f61443446f2dea2 v2.6b3
 +1ebb2a8cc06c94471d72b5476c2050c4d115a1aa v2.6rc1
 +525792097c6308a78a76b7b5f56bbd8a24c26acf v2.6rc2
 +95fff5a6a276520b2e7e0f75fe303f49376567a5 v2.6
 +cabf303e787aa5cd7209b40e3b2caba3ee75c5a5 v2.6.1
 +01f1ae83631ae82bd8598a11c17e3f9b3f56c38a v2.6.2c1
 +4feba09a826ba99e5b482707b3d9643eba34156f v2.6.2
 +1873542c00000c4b7ce2c7992d1f2d87f866232a v2.6.3rc1
 +00c3396d7a8c4ab4c2c841d61013a073ae921d0f v2.6.3
 +25aa90a6865b63133962dd64626c53c7b6fd47d5 v2.6.4rc1
 +ea1fdafbe4fe2458ac17287e0d6c709ed00fce5c v2.6.4rc2
 +8803c3d61da275c71cabe9e9d0274dac9902e2c0 v2.6.4
 +c9f68e42ab796a3bab4f8cf3cc69ce10503cb990 v2.6.5rc1
 +fa4630916699046357a5ac16884f3fc47bd0eaa6 v2.6.5rc2
 +99af4b44e7e490390817a597a542546d749e698e v2.6.5
 +c1dc9e7986a2a8e1070ec7bee748520febef382e v2.6.6rc1
 +e189dc8fd66154ef46d9cd22584d56669b544ca3 v2.6.6rc2
 +9f8771e0905277f8b3c2799113a062fda4164995 v2.6.6