merge of 551b99b264a271c5af4896cd57b97354be2f16ab
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 May 2006 20:29:04 +0000 (20:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 May 2006 20:29:04 +0000 (20:29 +0000)
commit3eeff07e8d6a2ca2d1dac8a4f21a1b6ae48c5121
tree73d3f8485ca618373cdf2167f4ab561523a8d90d
parent317f8eae6afad85b19d5b0c11c914c407c8c8e76
parent42614c8b501f80862cdd125c76a9cad7409bb1e2
merge of 551b99b264a271c5af4896cd57b97354be2f16ab
     and 5ae554cda8a73547164d9102e1fb7f3a9f9fe6ec