merge of 599c09d67423118adcf4ed6ee44637260778ff74
authorMatthias Hentges <oe@hentges.net>
Tue, 16 May 2006 01:01:26 +0000 (01:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 01:01:26 +0000 (01:01 +0000)
     and ebb36a79d8c57f959145afb2c1f8685843041b9a


Trivial merge