merge of '30e6927f64df64a690f6fa71e96e620cbf201274'
authorKoen Kooi <koen@openembedded.org>
Wed, 6 Jun 2007 15:12:59 +0000 (15:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 6 Jun 2007 15:12:59 +0000 (15:12 +0000)
commit9a12507bbf13e1a25bbecede41a9258bae3cb814
tree3b81c01f97d434e073eaece55eaa835084ac22fe
parent2c8167306487b402abee1feffa8bf543fc44b33d
parentc551fed673ae0c4235a3deae8c5022ff8e160792
Merge ... '30e6927f64df64a690f6fa71e96e620cbf201274'
     and 'e6bd0dc9230ea6acdcf964b4cbbe2d204eb2a5c6'