merge of 0a527a883f902e45560614ecaddc3e42e790c62f
authorKoen Kooi <koen@openembedded.org>
Fri, 29 Jul 2005 12:45:43 +0000 (12:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Jul 2005 12:45:43 +0000 (12:45 +0000)
     and 3e210bb0fa7fb81d3595767cca49ed749b921f1d


Trivial merge