merge of '10bc51a56352cd32ff5b7b70a1690ba41c538716'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Aug 2007 19:12:42 +0000 (19:12 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Aug 2007 19:12:42 +0000 (19:12 +0000)
     and 'a0e7e86db7c5ef00350a27bbe1959df6c1375b2a'


Trivial merge