merge of '45d524b88abbb00dc07aaebd7b8f052ad47664b6'
authorKoen Kooi <koen@openembedded.org>
Thu, 24 Aug 2006 18:23:19 +0000 (18:23 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 24 Aug 2006 18:23:19 +0000 (18:23 +0000)
commit9c95019a42e17cf987a5a20a74ccd8f3353dd58f
treedc518b4681279e7079d69f275f150d7980e244e5
parentaef2316c6d547eebca02b2a8ccb132f61514e7c3
parentddae175d473eadf224d0514f40e5ae3a2d9f21d6
Merge ... '45d524b88abbb00dc07aaebd7b8f052ad47664b6'
     and '593627942ba1a6623af7a814fb51159b1de235c1'