merge of '16117855ab79f990564455eee9d420e472e6ab44'
authorKoen Kooi <koen@openembedded.org>
Wed, 25 Jul 2007 15:20:22 +0000 (15:20 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 25 Jul 2007 15:20:22 +0000 (15:20 +0000)
commit2da13ebbe1c7ddae7c77364217bb1cbaddb8fba7
tree31a576184778be326be062b82e75c553db70e206
parent5e0430f8ebbe9cdf22423e8b2a39c5efe9dd301e
parentaf3fdf9495476b000ff6b50e8c3b8e15fa1ff422
Merge ... '16117855ab79f990564455eee9d420e472e6ab44'
     and 'a4e4bdd6c9f1532c72e89559a85e2a3c12d161b5'