merge of 031940b53227ed6076cc3d5e00220f0f9f1013c6
authorMichael Lauer <mickey@vanille-media.de>
Fri, 5 Aug 2005 09:14:24 +0000 (09:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Aug 2005 09:14:24 +0000 (09:14 +0000)
     and 246b163cc5c32e5b08f9265b553ca17e0240e59d


Trivial merge