merge of 532d9ba2654dfb76ff4b9272867357a92726e966
authorKoen Kooi <koen@openembedded.org>
Fri, 1 Jul 2005 07:09:28 +0000 (07:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jul 2005 07:09:28 +0000 (07:09 +0000)
     and c47283c3e0477386a1d877079a468c3bcdd19cd3


Trivial merge