merge of 42c2ebb949d65887341284ca09de93294c715b77
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Sep 2005 20:19:21 +0000 (20:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 20:19:21 +0000 (20:19 +0000)
     and edffa7178fc26b4b3fa5f13fc20d230d47136d23


Trivial merge