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)
commitbf1aebc777fb094b6d70cb2557e909cacf226a6b
tree3b7eb3c03b90ae77996887b28cdb3cb0683f8d49
parent3b1a342d9ddecfc89a4b761ea66d7a30c15f7d7a
parent1115a92bd7352643e133e8d090e45a30f23160a9
Merge ... '0fa75c6f3cf77dc7bedae2843b12d203a3d441a6'
     and 'bc4eddebb729c3e70a2c3d752d08bf335cbd0c9f'