merge of 055117b01c82e44d365d183017d935199f7ed576
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 20 May 2006 11:16:09 +0000 (11:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 11:16:09 +0000 (11:16 +0000)
     and e78de4108ff445d2186047833cfa53d4c7e0d6af


Trivial merge