merge of 97d200dc7ec222ba39a0dea542d91ccc2ac67ddd
authorMatthias Hentges <oe@hentges.net>
Thu, 9 Feb 2006 19:31:19 +0000 (19:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Feb 2006 19:31:19 +0000 (19:31 +0000)
     and d738d315f5897c652347f64e95f0be7cb643b622


Trivial merge