merge of '0fa75c6f3cf77dc7bedae2843b12d203a3d441a6'
authorSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 18:41:42 +0000 (18:41 +0000)
committerSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 18:41:42 +0000 (18:41 +0000)
     and 'bc4eddebb729c3e70a2c3d752d08bf335cbd0c9f'


Trivial merge