merge of 24bf9da058274d3f063eefc91fd48d60cb1b6e0f
authorMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jan 2006 15:38:36 +0000 (15:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 15:38:36 +0000 (15:38 +0000)
commit4a3c0e80ef889e31d0a09530ba9e6877b75f1965
tree359414a11d84fcc726dab447f63c13f2afc3b102
parente475db3258cccd9f7b098be7c82813766bfc63f7
parent022cad9938488cdc84511658fb112b73b7605c82
merge of 24bf9da058274d3f063eefc91fd48d60cb1b6e0f
     and 7ec5f433ed2baee7bf3ff7b6f5e7bcc764aba699