merge of 84ac7904b3e5b86a16d2ba1acac2d5a0876f3af4
authorMichael Lauer <mickey@vanille-media.de>
Tue, 18 Apr 2006 08:12:52 +0000 (08:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Apr 2006 08:12:52 +0000 (08:12 +0000)
commit3f913d931cc8049f0b9e9dea501f633384cc97bf
treefde869c1170a9812ea49fd1124a0f6cb1e402037
parent97b208bcfb1424789fe7dd997f27af3260a98b2c
parent64e654aeebc6ed77a55db584de6478e96b0092db
merge of 84ac7904b3e5b86a16d2ba1acac2d5a0876f3af4
     and d45556cc21173533cecace2eefbf3115a7563e06