merge of aefd8b85d8866ff05ae03c31658567c0a0d18d11
authorKoen Kooi <koen@openembedded.org>
Thu, 25 Aug 2005 13:50:04 +0000 (13:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 13:50:04 +0000 (13:50 +0000)
     and e4f6787633b4d486e7052126b91dadaf9a933dff


Trivial merge