merge of 4ed0964b486b99773aa438f582fa52d0b4e9b0d1
authorKoen Kooi <koen@openembedded.org>
Wed, 22 Feb 2006 10:58:26 +0000 (10:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Feb 2006 10:58:26 +0000 (10:58 +0000)
     and 95868ff13ffd9c5a92e6e0ae4637b3e07e4a626d


Trivial merge