merge of 211d3eafdbedbb4a02100687b6b195ac48fe2a02
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Jul 2005 12:12:10 +0000 (12:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 12:12:10 +0000 (12:12 +0000)
commit22b2a95bb4558807fae4fcf87c3aa5185c73b8cb
tree74105feaa1baccbbb9162ce6c9626d68e977e947
parent37ea2a9e29c94ba467bc6a377f81075be65df154
parentd92a72d8d4c3075b53dfa421c501d9682b34ae4b
merge of 211d3eafdbedbb4a02100687b6b195ac48fe2a02
     and d04c0208dfd4f8f9e4636ab4a192f056e6a1cf63