merge of 4ac478c0ff58cc879efa4b3954a917e2377a16a8
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Mon, 27 Mar 2006 21:25:01 +0000 (21:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Mar 2006 21:25:01 +0000 (21:25 +0000)
     and cc1ec8935114858197f3be2f7c969db8f38fe944


Trivial merge