merge of '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Jan 2008 11:58:39 +0000 (11:58 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Jan 2008 11:58:39 +0000 (11:58 +0000)
commitad11cf6e384154babfd4be9bbb94388426cae35d
tree3a6dc70763bf80be8f49c8ae803f6d2d9f6ce633
parent80ed869c73abee32442ead36dec94b4b84020a97
parent064866a7c84779bbf5d96bc5981565f338bce83d
Merge ... '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
     and 'e2acd7ca2afd3b646c7321798cc2ae3307bd951f'