merge of 62e43adfa95f28be56e88ed4588c52ea8b613b76
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Jul 2005 11:27:52 +0000 (11:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 11:27:52 +0000 (11:27 +0000)
commitcfb5aafc390f2661bbddda19abce1ac512cd31b5
treeb4a50d708f63cc219fa5419c810b06e706dd75cb
parentc17f3efae071c0ee02397c5ce917595bd3a63568
parentd5ca5aa235df13a1314c53d16cf454a5a50fc9bc
merge of 62e43adfa95f28be56e88ed4588c52ea8b613b76
     and 99b336970fe25f98faf47c5cb651ec42bf0897b3