merge of '80e11d2d53016f865ea2a634c725c9e643e7606b'
authorSergey Lapin <slapinid@gmail.com>
Fri, 27 Jul 2007 21:54:23 +0000 (21:54 +0000)
committerSergey Lapin <slapinid@gmail.com>
Fri, 27 Jul 2007 21:54:23 +0000 (21:54 +0000)
     and '96140c2b284f4cb67311bf2ca1e0926bd7fb5cdd'


Trivial merge