merge of 299d7ad50c11e98b4229b447db0f230399d5b808
authorMichael Lauer <mickey@vanille-media.de>
Sun, 7 Aug 2005 21:12:42 +0000 (21:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 21:12:42 +0000 (21:12 +0000)
     and eadb0128d53a398e63b8038f387db6940e12a469


Trivial merge