merge of 431299faa1c58d0b74b78c0214c3d6e1ca32abfe
authorMichael Lauer <mickey@vanille-media.de>
Thu, 8 Jun 2006 17:11:58 +0000 (17:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Jun 2006 17:11:58 +0000 (17:11 +0000)
     and 63331b30a6c2ad99fdbd6a71b486885353b4821d


Trivial merge