merge of 865901d3478c57c034f017d899de72e3a1d305be
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Sep 2005 20:05:04 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 20:05:04 +0000 (20:05 +0000)
     and ff8482dffaa2fde2376b39d9666e0598a8beae83


Trivial merge