merge of 'b43a990c14ad8ab39c9290ff13c74413357d3365'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 May 2007 00:17:58 +0000 (00:17 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 May 2007 00:17:58 +0000 (00:17 +0000)
commit5a31e33258c19b0ca28bf72910db0b3fd0ffb96d
tree3fcc2c9f12c743f0d5a61499b734614cf49565c4
parentafb0b01f1860f482b916fa3570912dc2091c928f
parent516830b16ecd87cb387d80bfcab53496beae3425
Merge ... 'b43a990c14ad8ab39c9290ff13c74413357d3365'
     and 'e39fd671622f6b7d265429c36cb31a14283b6232'