merge of 3e475547db06d6faf88fd643f2b80f61626f8fd5
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Tue, 29 Nov 2005 07:34:48 +0000 (07:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 29 Nov 2005 07:34:48 +0000 (07:34 +0000)
     and b295125c518f1603b591188eac10cf3f0bb818c3


Trivial merge