merge of 33e2cbcd599ba7ed2f9f5dccf7f4f2f24514ce89
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Wed, 26 Apr 2006 21:07:53 +0000 (21:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 21:07:53 +0000 (21:07 +0000)
     and 7da66fdac38a59d4284a8123c0234669c472a79d


Trivial merge