merge of bbe2ca73dbb6c79907ca7a1181ac42294641e6cf
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 1 Jul 2006 17:53:33 +0000 (17:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Jul 2006 17:53:33 +0000 (17:53 +0000)
     and da04e847a88d01afa85aa5baf10077864d9dc548


Trivial merge