merge of 2b5fa295a117990b2c79f21b2bcd9f9d730cca15
authorKoen Kooi <koen@openembedded.org>
Tue, 15 Nov 2005 11:12:23 +0000 (11:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Nov 2005 11:12:23 +0000 (11:12 +0000)
     and aa6fecda5cd87c53e3b490bfd65e9c792598aa46


Trivial merge