merge of '9f8dec37506722f0949550fe1cb9c966bcac3ffc'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 May 2007 09:56:41 +0000 (09:56 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 May 2007 09:56:41 +0000 (09:56 +0000)
commitd53839a731ee16061a4ee7f20211785d430e1b8b
treee6c32174b433957d0f0d097d6aa8422c3a419634
parentf11bdeb2b4d7bb5dd091ac65a25dc0a2200026f7
parentb7f5a6d711e44c3d245cdcb8fef3eac5349bf0de
Merge ... '9f8dec37506722f0949550fe1cb9c966bcac3ffc'
     and 'b328a484f7f03665eb8b12eb6894b9f90da04b62'