merge of 03087d586746fb627d4a39a0246bee0e2c120777
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 28 Oct 2005 15:08:59 +0000 (15:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Oct 2005 15:08:59 +0000 (15:08 +0000)
     and b706375f9fc0822067c40cb37d97515d3f1cf8c2


Trivial merge