merge of '4a7a14fac99e1af17265980554b9c5390863c35b'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 8 Mar 2008 22:45:36 +0000 (22:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 8 Mar 2008 22:45:36 +0000 (22:45 +0000)
commitf2b040fcd522d318121c6a407de095089b80f884
treee7cfe15b73c846890b17d18a21549f187ec70f5e
parent2e100a4a97a75b7ea8c6d730d6c1091a27df9418
parent8d27657bf723542f7ed862698bd60a094b8f9c02
Merge ... '4a7a14fac99e1af17265980554b9c5390863c35b'
     and 'd06ab8ea3c49e1734c6984d23d283558d4aef52c'