merge of 11bb54e0cf52d0c5a23e20076d3797d35cd2e8e7
authorMichael Lauer <mickey@vanille-media.de>
Thu, 18 May 2006 23:41:17 +0000 (23:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 23:41:17 +0000 (23:41 +0000)
commite757f845ebc5d903035b518a6a4a58265b03ba06
tree83e0724f70bd583122517f64f515d49e939fce2f
parent2b91e2e1153d395bd458ea3d3e0705ffb0ddbe61
parent3dcbefec8c78903f1b5e0d8e52b53afbdf03ef7c
merge of 11bb54e0cf52d0c5a23e20076d3797d35cd2e8e7
     and 8d2aa23a304d9d1a81851b96ec6e5cee74f24fe7