merge of '034cb4d5ba90b319f9a706faae008874ee15b7e9'
authorSergey Lapin <slapinid@gmail.com>
Thu, 19 Jul 2007 09:25:21 +0000 (09:25 +0000)
committerSergey Lapin <slapinid@gmail.com>
Thu, 19 Jul 2007 09:25:21 +0000 (09:25 +0000)
commite0f429dd3d266b453984aa2b86688301df8871f8
tree4d38d3c3d6c052bee6e7101532a1c390437dad9e
parente4ca3f5ed310d2f3730ff1e9e646716999a818eb
parent658f5d69e4190e450b916577d89c3f77153fe286
Merge ... '034cb4d5ba90b319f9a706faae008874ee15b7e9'
     and '998f0f497d358b8816a0539ed794c21b62f0df02'