merge of 03b7b6de8867ce08c1e283e916d64764e390c898
authorKoen Kooi <koen@openembedded.org>
Fri, 28 Apr 2006 11:10:11 +0000 (11:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 11:10:11 +0000 (11:10 +0000)
     and cb46841214d74586c2ece7859e359ec795fd146b


Trivial merge