merge of fb53c03fb636482fe26316e5adacbaeb4ddd5634
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Jun 2006 18:23:46 +0000 (18:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 18:23:46 +0000 (18:23 +0000)
commit979cab34e7007b68e5da46a5e79485ac1797d10e
tree6e0420f41341be6763d4f364913b9ae9da89b963
parent017b42a2a426c816780af98c28b30d3bfb3c67e6
parent8a4ac051f2d6764d53f4f7674e9a7bb6f7f59d69
merge of fb53c03fb636482fe26316e5adacbaeb4ddd5634
     and c2029c080c2c9d3dc9675ff97d1ff45df7c5fd08