merge of 30cb3036d3a6a06d185c6a941ab380be44868897
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Jul 2005 10:29:25 +0000 (10:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 10:29:25 +0000 (10:29 +0000)
commit0a18998c76e3fd1822ab8a8ee9af603f378f9833
tree414065d2b19f86ede0da3039051ef669a101569e
parent01d62c4ab8d7d07f4b6e7db7c3e099ad720475eb
parent2b0f8eb623187c59b245ce0b845ded8072ebcd86
merge of 30cb3036d3a6a06d185c6a941ab380be44868897
     and f53aad80b477af19e98c6b4ac4cc29e7b0277338