merge of a56b1beed74d7cedad94cb2edd928cddbf3bf089
authorMichael Lauer <mickey@vanille-media.de>
Tue, 13 Jun 2006 22:35:28 +0000 (22:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 13 Jun 2006 22:35:28 +0000 (22:35 +0000)
commitfd390c132db121db8e3abc4d8d0ec95e3bdc3e6e
treec2ef7b96c4313de05450c5546705645241aef25f
parentf9d23bc86e43d4414287c8aadbf89ebcf2797ddb
parent9008ba0b855e7ee542b4046035021571cb46a529
merge of a56b1beed74d7cedad94cb2edd928cddbf3bf089
     and bf11bb142f46acb4b38b498495dff52f4b77083c