merge of '6466dc79dded8ec3ade8c212b27f84f9699f48e1'
authorKoen Kooi <koen@openembedded.org>
Tue, 6 Mar 2007 10:24:58 +0000 (10:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 6 Mar 2007 10:24:58 +0000 (10:24 +0000)
commit76fb5fea94809a4c14a723d192667eaf2bb0b86f
tree6e847bc8a369fce293607b963cf254346a66e5de
parent438028c981a45f9fa482bdbc477ba7d354311c46
parent420319f18131384d640955342a42d7bdb35c922b
Merge ... '6466dc79dded8ec3ade8c212b27f84f9699f48e1'
     and '692c2b51db3e49bf51daec9a4656898cf8994fff'