merge of '4fb1a7447c5d8ace96a5ac6358c7fe10f0d951c4'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 30 Aug 2007 15:29:13 +0000 (15:29 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 30 Aug 2007 15:29:13 +0000 (15:29 +0000)
commit6aa02d77a8010fa65c91bb20b2093d7200654747
tree2f7d0b6aa8bfa2834a88581ca4a44bb4acaf1185
parent4b1cd1a74528f3cc56cfbd31dcc0ead3446bfab0
parentc36161c80274705433f7ad5b641b337870c7966f
Merge ... '4fb1a7447c5d8ace96a5ac6358c7fe10f0d951c4'
     and '969fb79142680f77b64829b367c495c5836d4327'