merge of 1ee22e5dc2cdeec8a88f1136a019329901a0c9f3
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 May 2006 23:07:17 +0000 (23:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 23:07:17 +0000 (23:07 +0000)
commit7ce3b45fa4d78b07604dbfed2acb36013964b8b4
tree63695a9cd7820ce099c963b907853fa9ea97aa70
parentcab3617a57c2308ef14d43acfe4d3db8fbaf6c74
parent5bd360c14dcb39f4cc58818538b62f5aa51ebadb
merge of 1ee22e5dc2cdeec8a88f1136a019329901a0c9f3
     and b971ecbe14a98d023c916e28714ea42ab6a3b1d0