merge of 190f2a680fcbd7ef0c24337df43378bded12f048
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Oct 2005 10:11:30 +0000 (10:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Oct 2005 10:11:30 +0000 (10:11 +0000)
commit0f2f623da0cccd2eae320f9353bd915cc59a5af3
tree5beddc21c77f8bd559dc0eabf099c90cb8c732b6
parentc8fd411998c580890374c1d11ce53871ffe6092b
parent2707ca240b69538f1dfebe668c913aec8cd6842c
merge of 190f2a680fcbd7ef0c24337df43378bded12f048
     and 665676b78fde532560ccfc82e50fa0416cee55c5