merge of 383f54bb340ef9be1fdf7241b922566502b40e1e
authorMichael Lauer <mickey@vanille-media.de>
Wed, 10 May 2006 18:36:41 +0000 (18:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 May 2006 18:36:41 +0000 (18:36 +0000)
commit1f4b85e7578cda25dd41a01eb5717dab5e9301a8
tree66c2ab82d2ba4a96d6d638ed0b4ea9365d37ce1a
parentab68090f61ab662aff02726dd8d40cf37019249b
parent57c020556dfc130948655cf3fd15ae9ca89ec611
merge of 383f54bb340ef9be1fdf7241b922566502b40e1e
     and a3dbfe01cde42b68cf450e18651fe60be57fe1bb