merge of 'bc5087d2ff20b3a1f43d573613a883bbc0594976'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 14:27:22 +0000 (14:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 14:27:22 +0000 (14:27 +0000)
commitb99c102029cfaaf07aa79eeed43a3d7068bd48b9
tree70e929391bbb83bd422236989661de72ec42e2f7
parent6b2b3026d13d1fcdf66cfd9969c3c6549030375d
parent2ce1e8f47a9c6f937652d4c122538d01fc136898
Merge ... 'bc5087d2ff20b3a1f43d573613a883bbc0594976'
     and 'dae6d011c2090a45ec8d231d5e568e3e12289f6b'