merge of 0fbcc5da7abe05787c6a591e53e9072cb3b115d5
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Wed, 7 Jun 2006 20:06:48 +0000 (20:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Jun 2006 20:06:48 +0000 (20:06 +0000)
     and 99f9fc9ea4f05af6472ec5a42c5a6516440654e6


Trivial merge