merge of 38a9824230c1f33aa1b69405d1a6074d1df99753
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 Aug 2005 16:40:05 +0000 (16:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 16:40:05 +0000 (16:40 +0000)
     and d83e77353ac4cf240e630aa66aa54eb794547a60


Trivial merge