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)
commit57e9d2faad832e99be6b1ba6cbe9e743b5b99e3d
tree2067b1454a459ec54751f7b64a8dc36c170a452b
parentb933f0e2d7b9cfa8f22065bf93bfe49b9dd2ade3
parenteb07af9e21677e9265a7b28d78a3b10a895c41c8
merge of 802b5c32960cd36a01f851dc081ca5c7b123dec5
     and a7553a96f640438ec67f0ffe109c920e46e60972