merge of 1e7d948f0d03b427916f50dc6a5f9379b1d40f75
authorMatthias Hentges <oe@hentges.net>
Tue, 21 Feb 2006 03:22:39 +0000 (03:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Feb 2006 03:22:39 +0000 (03:22 +0000)
     and 362abe3a84010b7c14f779ccec407601248db7db


Trivial merge