merge of 8b41db425f053a0c79ef7f41b7f70619b23390d7
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Jul 2006 13:32:30 +0000 (13:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 13:32:30 +0000 (13:32 +0000)
     and 8d2a59cf6417a38e14b99b0e8080564c6c5fbdc2


Trivial merge