merge of 44b28997699d21a52c2534ad766098e70cb37851
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Apr 2006 11:30:34 +0000 (11:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 11:30:34 +0000 (11:30 +0000)
commit4c9e559843c70e4cd335660a181c87310206a8a5
tree51c577efb2a36bd9d9575c80486c9f228b91be3d
parent695fac3655afd6c38e49ceb953002cf02f994d79
parent34bda7facb9b49e35f2ce78585c83c2afd31c0f2
merge of 44b28997699d21a52c2534ad766098e70cb37851
     and 8d5c66be0d6a1a7ef4099b9106ce4d03a6b55b3b