merge of 6efbfec71e63ee2a821512e58cb523b4ead883d6
authorMatthias Hentges <oe@hentges.net>
Thu, 11 May 2006 17:08:01 +0000 (17:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 17:08:01 +0000 (17:08 +0000)
     and d357b0f02022987c9fa01fadcab872e091fede5e


Trivial merge