merge of 12fab859e46a5b7c800c685dd8a3595e6e74c5e7
authorMichael Lauer <mickey@vanille-media.de>
Thu, 1 Jun 2006 19:50:50 +0000 (19:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Jun 2006 19:50:50 +0000 (19:50 +0000)
commitef9bef657fcdac524257084fb63059331109502d
treefa8b6525c03da2f5445444339850615349d9cbad
parent5e6c1a56eab5c4129af064e6980c80aeb8a79591
parent1c72612d1954d8e6c60f591befce4cd71cbe0caf
merge of 12fab859e46a5b7c800c685dd8a3595e6e74c5e7
     and 1d06e6b15d2905a1cad4fc0f31a004a369b66d1c