merge of 5f35d986fdda87fb19898bc6150d8325c737273f
authorMatthias Hentges <oe@hentges.net>
Mon, 3 Jul 2006 15:16:55 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 15:16:55 +0000 (15:16 +0000)
     and e97331a2b823abbbc0aa40e32d3ce1f542575042


Trivial merge