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)
     and '998f0f497d358b8816a0539ed794c21b62f0df02'


Trivial merge