merge of d0c5b7c949900a094e2ea11d85707b56997e2c91
authorMichael Lauer <mickey@vanille-media.de>
Sun, 2 Jul 2006 20:37:42 +0000 (20:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Jul 2006 20:37:42 +0000 (20:37 +0000)
commit44243e69a77338097b295c1eccb58adcb8a91038
tree2da4f0457748ee06410e9f9a4dea3cd35bbf2ec3
parentc51f011f9aeb125346e597c260fe7dfeb71da98e
parentb464f87dffccc2a4b0d2fd501930dd1ba31ca98b
merge of d0c5b7c949900a094e2ea11d85707b56997e2c91
     and e4222200ae643006a3cbf7b68e35883321c05949