merge of 4331fe84e383e44c80f5771143f3f2ab6f522c48
authorKoen Kooi <koen@openembedded.org>
Fri, 3 Mar 2006 17:00:45 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Mar 2006 17:00:45 +0000 (17:00 +0000)
     and 78ec2de1cad3328aa990b529ccaa5d719f5efe7a


Trivial merge