merge of 6d3ab1c248e51c9e183169b8ec8cd0fee592080c
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jul 2005 14:21:42 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 14:21:42 +0000 (14:21 +0000)
commit17ab5f4762a3d2ecbcc7d086be47a10b7c9de7dd
tree9eaf48285234822bc0ea24926446d662619547e1
parenta061461970fc229342633011d6ea926e69470d8a
parenta7764df4d7a33f7a887f95bd00fe3bb331ddbf93
merge of 6d3ab1c248e51c9e183169b8ec8cd0fee592080c
     and e0bd53b164a199028ffef45edeab4802fb20522b