merge of '9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be'
authorSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 15:35:27 +0000 (15:35 +0000)
committerSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 15:35:27 +0000 (15:35 +0000)
commit84978a329e9d55721bb48fcb777306ec9293b116
tree874da58acedcc3047c85a6e87db2e52cd5268f68
parent8c8ac6204e0e3bab2160f1848dcec1dec02836df
parent6b4888bdbd71b9f6dd184a36352b6c6b399b09c7
Merge ... '9f7e70ecb0865dfc3910ad4c1df4bd4dba8045be'
     and 'dc7a1478132ea78d3fa01747098955c76cdf9249'