merge of '3fa76fd2a4646a878f0810156dec4b7da94c14f2'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 6 Dec 2006 10:55:45 +0000 (10:55 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 6 Dec 2006 10:55:45 +0000 (10:55 +0000)
commit17582a4ad4e22d8a4c65739913c63acb5d091aee
tree279bf2aad80fb7f86aacefda30665d354a563e31
parent2aedfc4e34a370cbdec09d7a258d60cc4ad63ac3
parent5b541ff766ed2a9ed77cd68ed558651a4fa5f5ae
Merge ... '3fa76fd2a4646a878f0810156dec4b7da94c14f2'
     and 'ee31c6e3fc63b93eae8552042728645a8206cf1c'