merge of '3f738271e74b011b3fc67c84d8222f5398d1f56f'
authorSergey Lapin <slapinid@gmail.com>
Fri, 13 Jul 2007 22:31:48 +0000 (22:31 +0000)
committerSergey Lapin <slapinid@gmail.com>
Fri, 13 Jul 2007 22:31:48 +0000 (22:31 +0000)
     and 'd7d8f34cc9dafb7b0ee2ab018d07d6787541f161'


Trivial merge