merge of '1b5769504979ed00982f85f0ceb79250c4391a89'
authorSergey Lapin <slapinid@gmail.com>
Mon, 26 Nov 2007 13:42:17 +0000 (13:42 +0000)
committerSergey Lapin <slapinid@gmail.com>
Mon, 26 Nov 2007 13:42:17 +0000 (13:42 +0000)
     and 'fbe0639618786fa2fa92888fc0eb9bfba2b76fa3'


Trivial merge