merge of 4fa7f171e4ab9878ada3ea61bf2133d23760f203
authorKoen Kooi <koen@openembedded.org>
Wed, 22 Mar 2006 20:53:08 +0000 (20:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Mar 2006 20:53:08 +0000 (20:53 +0000)
     and d5059d334780525ec675748a3862597b1e5c7c7a


Trivial merge