merge of 8b069f0b5e4fc820af1c8f803a12366dbb47a104
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 May 2006 21:50:39 +0000 (21:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 May 2006 21:50:39 +0000 (21:50 +0000)
commit306d832e65d41aa3dd5966ed9eaf7aa60ff77e39
treec7d77688318284007a22f83f7b6632e5f9daa225
parente8c0386c00c258ee696a0b1cb3800e0492b80218
parentc6b995c8c53474289bd0e389e9372d73fa6594d7
merge of 8b069f0b5e4fc820af1c8f803a12366dbb47a104
     and 9a476ca14bf1cfb6a29b0a506daf400991c515e4