merge of 78fbed1dae12cc05db2a4773ecaa9e752733f733
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Jul 2005 22:12:54 +0000 (22:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 22:12:54 +0000 (22:12 +0000)
commit9d58c1020a9fa69e11362774ea7f18b2ee619486
tree2606648a921688bc9f5b2b52347ee226a593f880
parentfd78ba9fa8e711dcc99f29257b1c7bcde8026997
parent3095f103f2d742eaa1e34828d3344129a6b6c6af
merge of 78fbed1dae12cc05db2a4773ecaa9e752733f733
     and 811e0e1d1053a004286d73e1a2b3fb1a1d74234a