merge of '89bba7eb47ad2f3eb9ac364f1e647d914b007772'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 16:20:07 +0000 (16:20 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Apr 2007 16:20:07 +0000 (16:20 +0000)
commitcfe60fe4a52699064cde1046462cc7f9b0db6595
tree2cd3059106765690fea5d63626fc8f38262ee6c4
parent8dcda81ce278514686d55fac9a1b65b8b0a5b021
parentaaedfb448dcfd455f07f2f0889e40a5b8edece9c
Merge ... '89bba7eb47ad2f3eb9ac364f1e647d914b007772'
     and 'c590a6aeacecad0f59f2b80123eab8bc3737935e'