merge of 4ba84c5c9cdff518f67f0beabbc85ba4888d789c
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Oct 2005 20:35:29 +0000 (20:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 20:35:29 +0000 (20:35 +0000)
commitdc4e37d7a27ac12d391289f7f5b42a5124325750
treeb5a8b78bc543fa02c1ac4b654e8d46a599a4d22e
parent17962df01f5e2902b4f6cb9cf3a3de6ef62c6ad8
parent465873d1fe1a46ea5d7e93fc907865eb1e62b461
merge of 4ba84c5c9cdff518f67f0beabbc85ba4888d789c
     and 5e19733decfc6d866375641949b24b63dd5b2a3e