merge of '910e407ede2c21fb664e4341b86db29ea58c5a5e'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 18:15:24 +0000 (18:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 18:15:24 +0000 (18:15 +0000)
commitb6f6f141d361cce8a91160939403527082ef22c0
treeafd16ff1d5084e75a8df24eff82fd31075ec227d
parent4f1963886d9d2227be98a4473ceefc9c1011d1fd
parent6bdb98734e08cf7f1adb65a39ddfc108b1e85b45
Merge ... '910e407ede2c21fb664e4341b86db29ea58c5a5e'
     and 'd6f3bb8607dabe43539791a91bd897b0f9089cf2'