merge of 17b5ed09da5a4cdb493874b746d2586d5ba53c86
authorMichael Lauer <mickey@vanille-media.de>
Sat, 20 May 2006 18:31:50 +0000 (18:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 18:31:50 +0000 (18:31 +0000)
     and 8d5e1a3025b2da6e7d30136891450c13c77eacfe


Trivial merge