merge of 60c043fd54516cb786cb22ad9d4e45c007dd7386
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 May 2006 16:14:24 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 16:14:24 +0000 (16:14 +0000)
commit600044a2b11ab53bdf73e7e33cf193fea91a35ad
tree6cf662e17635f61bd8c2d27e29d395c536a08512
parent1041317d426ec30a4e5d3d089820565771728c40
parent415b2d5cc9b4d0aaef7368b1ba2011cbacc4e90e
merge of 60c043fd54516cb786cb22ad9d4e45c007dd7386
     and 741ca0595f53aa1061d415c78f7788109ca59183