merge of 621bf027644015319adb51145e07f9d6e3195b93
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Jul 2006 12:03:11 +0000 (12:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 12:03:11 +0000 (12:03 +0000)
commit399f46f80855ab646143c4f3d5b65505b3cf36d0
treef5fab6688e6c57701ee9a1d31d59478465f9967b
parent154e2d11e0915bf835aee9dddf6de954de4c68e8
parentdeb7c0557bd30de7117ac42147292c07891a85e8
merge of 621bf027644015319adb51145e07f9d6e3195b93
     and c7701984b00dc8815849c8332b5967f4c9a81ab2