merge of '5e082795f9bdcb7a895ebe0387566db073a6b4f6'
authorSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 15:11:12 +0000 (15:11 +0000)
committerSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 15:11:12 +0000 (15:11 +0000)
commit8c8ac6204e0e3bab2160f1848dcec1dec02836df
treef9eaf1f33b5bbbe281d8c414d61b67d3962dc569
parent89bc399aa9a905624c912f69d97d25d001787554
parent41a9fdc088f60373864a5128e5b69d467412a34c
Merge ... '5e082795f9bdcb7a895ebe0387566db073a6b4f6'
     and 'c0b27fb20d3acf8fd54af737b63355f45246e05a'