merge of 8682c577fb2d85f5eba728c853258b0de8554651
authorMichael Lauer <mickey@vanille-media.de>
Mon, 8 Aug 2005 21:54:34 +0000 (21:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Aug 2005 21:54:34 +0000 (21:54 +0000)
     and e35e2ff24f4fd9e88928070713917ac9ebae8029


Trivial merge