merge of 44feda31605fad4e0b09c7f8c3f7fb125d386297
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 8 Jul 2006 19:32:08 +0000 (19:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 19:32:08 +0000 (19:32 +0000)
     and c0ec3b8284e6b5273151cb83f795bcd3bc376285


Trivial merge