merge of 4d9248891bbabfcd869f50b24c59eb8d29c6c48c
authorMichael Lauer <mickey@vanille-media.de>
Wed, 21 Jun 2006 14:05:50 +0000 (14:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 14:05:50 +0000 (14:05 +0000)
commit7d3136018630882e597a1c19d0fbac2f2fc2207c
treed45083267ff271bbf1ca081087ba370716b16100
parent91564285c8b22b2ce3254cdcc00caff8eb3f15a9
parent024cc3f57b51c3919ed7b543d6d86e46bb3735ca
merge of 4d9248891bbabfcd869f50b24c59eb8d29c6c48c
     and 819d48f7dfdcf5e59b36b88b9b518d8d76d04f06