merge of 4b0334a79ee9a465dadc42051cb5deeafdc00921
authorMatthias Hentges <oe@hentges.net>
Tue, 21 Feb 2006 12:28:05 +0000 (12:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Feb 2006 12:28:05 +0000 (12:28 +0000)
     and 97d90ed866f4cb7d5b7c28183663143a155a1ee5


Trivial merge