merge of 0415e9a2076e6c6342016b64c577a71db1c9d5d0
authorKoen Kooi <koen@openembedded.org>
Mon, 18 Jul 2005 22:22:11 +0000 (22:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Jul 2005 22:22:11 +0000 (22:22 +0000)
     and 0c0e42d7342579eb1ee491a6b8a0a8610fe644c5


Trivial merge