merge of 0b32c3262ef809324fd2b1cf3daffb33589fe68c
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Jul 2006 10:20:17 +0000 (10:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Jul 2006 10:20:17 +0000 (10:20 +0000)
commit146ed213bfdc4c840f58f0af4c5dd25417523bf4
treea081ff14ea8010887d2d9eb63b485eaca2905828
parentc6385a0ae39b23ffe964128e105760e03b2c626d
parent7cc05e04e43d8c7d1571f24435487cdee3effd49
merge of 0b32c3262ef809324fd2b1cf3daffb33589fe68c
     and 7bffbf2364668b2cd3e8ca978561a2cf01152db1