merge of 95ff9f961bf59ce2a886e3909caec19578cdb748
authorMichael Lauer <mickey@vanille-media.de>
Sun, 7 Aug 2005 12:36:48 +0000 (12:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 12:36:48 +0000 (12:36 +0000)
     and d7ed0afa1330981687d744a07b9d8b03ef46a6bf


Trivial merge