merge of 2c0dc71f8da60df5b77594c30e93defdc6912190
authorMatthias Hentges <oe@hentges.net>
Wed, 10 May 2006 03:56:01 +0000 (03:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 May 2006 03:56:01 +0000 (03:56 +0000)
     and 4965a1904f74b0f45a605aa40b6dd9513d725781


Trivial merge