merge of 4ae75badc5589c35fd33c90369b77e8d0a4d0c46
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Jul 2006 12:53:16 +0000 (12:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 12:53:16 +0000 (12:53 +0000)
commit685cf31f2462873bb67a7d0c7c6d96bbd36529f5
tree24d9639adda0aed9a7e926e3878c903a9e8b30a7
parent1eb690ef768680928f40ea37cf91bb21959d2d2b
parentcd3ff97d19adc158b63d54d20e66b4fc45105ca4
merge of 4ae75badc5589c35fd33c90369b77e8d0a4d0c46
     and b2d6befb14a575e840b80779b3ee9e578a4bb3ce