merge of 58569a0e47bb26450c7e67d5aa0b20806e2b2a50
authorMatthias Hentges <oe@hentges.net>
Wed, 17 May 2006 08:10:04 +0000 (08:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 May 2006 08:10:04 +0000 (08:10 +0000)
     and 5ae0815fd4186ce653535a78ab0e482e9a7c24f4


Trivial merge