merge of '411648a693b0891df1f4d2e407cb14d3641cde2a'
authorSergey Lapin <slapinid@gmail.com>
Sat, 1 Dec 2007 03:30:21 +0000 (03:30 +0000)
committerSergey Lapin <slapinid@gmail.com>
Sat, 1 Dec 2007 03:30:21 +0000 (03:30 +0000)
     and '71df4f75a1331353855f0e6a93d2e806439e90b3'


Trivial merge