merge of 0e3cf43c8f55aec7cdc3b6f4ff71869298320085
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 Aug 2005 12:01:52 +0000 (12:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 12:01:52 +0000 (12:01 +0000)
commit0befb98bb295a647fce198f5429850e93839ecb8
treea5647a11f80457d6dc711b8a83e8c09ad3b106cf
parentbf063536bfd581f32105b9659f5ea9ee39259385
parent649c30e929cc83ffabf85db4577fe5b3df263788
merge of 0e3cf43c8f55aec7cdc3b6f4ff71869298320085
     and bc232d57e1fb3fa3c8e9f6e840e1bc9ecf3a7d55