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)
commitdf24ff00aa29c1c7cd671d85a06191d1657443ec
treec4b62bca9cf4ded03dda96173210536afa2d2445
parent32c2d4fb830df236bf889ff7562ba49a18a447ae
parentffdb5b0f12e2faf0e0fe9484dd4ccd42082731e7
Merge ... '3f738271e74b011b3fc67c84d8222f5398d1f56f'
     and 'd7d8f34cc9dafb7b0ee2ab018d07d6787541f161'