merge of 1a204644a2419a905a060144eb028dfcb467391a
authorKoen Kooi <koen@openembedded.org>
Tue, 23 May 2006 18:58:40 +0000 (18:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 May 2006 18:58:40 +0000 (18:58 +0000)
commit33a3fcc0a79a19918dae356251bd70cb598a1423
treef0e0f3dec8459933c84bcd22c74a9297ec6b5f5e
parent0ded07b11f6110637773d80e76054683cfc666be
parent751b155c494df0c119596a239d3b9ca6ad5f6778
merge of 1a204644a2419a905a060144eb028dfcb467391a
     and ce94922846908c2edd7362a56618ea051b244c3b