merge of af4df6cf6c1c2920365147ec393e688fdb85b6de
authorKoen Kooi <koen@openembedded.org>
Sat, 13 May 2006 18:27:19 +0000 (18:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 18:27:19 +0000 (18:27 +0000)
     and c8459c74f176dc141188b488b5c3e56beb6ebf13


Trivial merge