merge of 802b5c32960cd36a01f851dc081ca5c7b123dec5
authorMichael Lauer <mickey@vanille-media.de>
Wed, 10 Aug 2005 16:47:52 +0000 (16:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 Aug 2005 16:47:52 +0000 (16:47 +0000)
     and a7553a96f640438ec67f0ffe109c920e46e60972


Trivial merge