merge of '5e082795f9bdcb7a895ebe0387566db073a6b4f6'
authorSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 15:11:12 +0000 (15:11 +0000)
committerSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 15:11:12 +0000 (15:11 +0000)
     and 'c0b27fb20d3acf8fd54af737b63355f45246e05a'


Trivial merge