merge of 0c62f25e84f8a78969b680d2d89b88b32c540d8a
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Aug 2006 16:22:50 +0000 (16:22 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Aug 2006 16:22:50 +0000 (16:22 +0000)
commitb9839e8807ed8dacc3052294018433e41d2aeeda
tree2610487ebac3dd1966bbe8c9fd187eea3f904a68
parenta4bbe9dd7f07b610bf275a1bce4829f18069f581
parent7bd6b93c45c1cf31e8593b0e8ee433f5d6c5100a
merge of 0c62f25e84f8a78969b680d2d89b88b32c540d8a
     and befec029b0968612722681e4b1bad74128e981d6