merge of 143171ba4cb95821314675d1cb46491353e62030
authorKoen Kooi <koen@openembedded.org>
Mon, 20 Feb 2006 12:55:23 +0000 (12:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 12:55:23 +0000 (12:55 +0000)
     and 5940fb0f49cdfe1680ae936ca512594587c56b1d


Trivial merge