merge of 27ce3dcb3ae4cdeafc78be0419448c83a31e6c86
authorMichael Lauer <mickey@vanille-media.de>
Tue, 9 Aug 2005 10:46:10 +0000 (10:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Aug 2005 10:46:10 +0000 (10:46 +0000)
     and b545254923165588edbe4ef88061c70e7283ec17


Trivial merge