merge of '4213de3ffd14e7cf6ceeabc6b2c47a76575ff89e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 16 Jul 2007 11:48:01 +0000 (11:48 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 16 Jul 2007 11:48:01 +0000 (11:48 +0000)
commit7611fe6b6a3a689d45b26879b7dc0741fa2e30c1
treefd20d92d57775ebff656ba3a27de238edc5bf8ad
parent65d1a7413f9f40230da93b31f9a399ada56e14db
parent1ca7f217f7d2baf3901020729214ed053511fbe7
Merge ... '4213de3ffd14e7cf6ceeabc6b2c47a76575ff89e'
     and 'ea6fbf0b5697e9ae66409f2f0cfb84269eca8a2e'