merge of 'b96a1271f00720aba73dc0f7c2b08974c38252ac'
authorSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 12:09:05 +0000 (12:09 +0000)
committerSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 12:09:05 +0000 (12:09 +0000)
     and 'c43653bfb560ae719097dc966db74985b9b905ba'


Trivial merge