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)
commit04fe30d27b55b62feb752d11646c44c42ccc6e64
tree0f720e71331ebaea415fbe7d10dc7ec6933ae9c9
parent1a78c97ede586276544211916b44d8467e60c3bf
parent9e59a4d34711a3c8e1f673ccb10dea0445e1a74b
Merge ... '80e11d2d53016f865ea2a634c725c9e643e7606b'
     and '96140c2b284f4cb67311bf2ca1e0926bd7fb5cdd'