merge of dac9c8eeceebb1b6b50179ead5fa288d4c1f99bc
authorMatthias Hentges <oe@hentges.net>
Tue, 16 May 2006 09:39:46 +0000 (09:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 09:39:46 +0000 (09:39 +0000)
     and df734d86f4fcc7adee439e6e46c105fa16918c1b


Trivial merge