merge of 27ae8c38ea46dc438dd5410aef29822f1e94db2b
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 1 Jul 2006 10:26:39 +0000 (10:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Jul 2006 10:26:39 +0000 (10:26 +0000)
     and 5ef996f8aee772981da0240610a0b4bfeb1ef68a


Trivial merge