merge of 2109e112bb3a836e7b627253f84a9efa2a19f779
authorMichael Lauer <mickey@vanille-media.de>
Thu, 7 Jul 2005 09:46:29 +0000 (09:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 7 Jul 2005 09:46:29 +0000 (09:46 +0000)
     and d5919dcd4efcc3277f396379d72ee2734c1b8924


Trivial merge