merge of '053d742c2229e2b07ec4091286904c0972494f3c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 14:38:39 +0000 (14:38 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Apr 2007 14:38:39 +0000 (14:38 +0000)
commit1094af5b9af66f5e486e886eae719d95c3c929a8
tree8cf143fd65f942e69edd1edea437b98213d9a873
parentbcd3f1f2337a8fee41e2f5dc575da78d94726ef8
parent09d5e0f91495fcd66847b6db030683e30c15c124
Merge ... '053d742c2229e2b07ec4091286904c0972494f3c'
     and 'b3af45890d6f25fd694e2af28fd291018aaecd2a'