merge of 'cf1a08098edb7df94073a8189329602a04381206'
authorKoen Kooi <koen@openembedded.org>
Fri, 28 Jul 2006 07:49:46 +0000 (07:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 28 Jul 2006 07:49:46 +0000 (07:49 +0000)
commitac34fac42763eee1a8f39619c21700bcac0a0e9e
treec40523de3210c9fe680fcab6bf66efba8a57b670
parent7f60a9b876c19ca2adee40c7a780a4de1cb25ef0
parent7d555fe158d3b8a2a3e0ea2cea055534221d4609
Merge ... 'cf1a08098edb7df94073a8189329602a04381206'
     and 'f43951bf0f4ebd5ecbec9b661205593b8837d3eb'