merge of 82ffaf9e2567890f4e83883fbbe794c759dac49b
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 8 Jul 2006 08:24:48 +0000 (08:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 08:24:48 +0000 (08:24 +0000)
     and ba9294b53b86de3856bb4cbd8daae37b2453da08


Trivial merge