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)
     and 'dc7a1478132ea78d3fa01747098955c76cdf9249'


Trivial merge