merge of 1128356cf74edd3dc9e128ad1f830a989faf8e2f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 21 Jul 2005 16:42:58 +0000 (16:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 16:42:58 +0000 (16:42 +0000)
commite40c5b40e67325fd054d160367f0d52c4bfc91b9
tree323270453f8d6bb3c0cb1cf561664f1a7d534dca
parent679c90c88802a0651613c842d1d89ae55f2b72d4
parent17ab5f4762a3d2ecbcc7d086be47a10b7c9de7dd
merge of 1128356cf74edd3dc9e128ad1f830a989faf8e2f
     and a8d45d0b05a8392ab241eca4deab7c8bc83b0a2d