merge of 'a1d864e39820a6d83791681ce836e11ac38a89b6'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 21:14:12 +0000 (21:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 21:14:12 +0000 (21:14 +0000)
commit189eeba1948c7e4def33a113ceffdeb4f5567e1f
treeeefca2a57c1c3e8ee8f8712448644b60363eaec0
parent267cf1fed093319afbc1f3d47e4efaca83d83149
parent21a20a6d6cc8f87061d3e4fa557971447fa64adb
Merge ... 'a1d864e39820a6d83791681ce836e11ac38a89b6'
     and 'db2f843f48cece5e25cf2e654db269ba3dba5192'