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)
     and 5e19733decfc6d866375641949b24b63dd5b2a3e


Trivial merge