merge of 79fa588c44f87f6ad9821f7fb8136225ef69860e
authorMatthias Hentges <oe@hentges.net>
Sun, 19 Feb 2006 20:59:51 +0000 (20:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Feb 2006 20:59:51 +0000 (20:59 +0000)
     and fdb266aeebd8da05f0c3b76a855ad56627c198b6


Trivial merge