merge of 2091d412f452437ec9b7db4efc878f7c22f56082
authorMichael Lauer <mickey@vanille-media.de>
Mon, 26 Jun 2006 16:05:53 +0000 (16:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Jun 2006 16:05:53 +0000 (16:05 +0000)
     and ffb6505b4ab01a77c295daf9d0dda5c950eb1e89


Trivial merge