merge of 1db2f2b8a272dbada8a2ce16756fbd5d1e2a143d
authorKoen Kooi <koen@openembedded.org>
Mon, 17 Apr 2006 12:42:48 +0000 (12:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Apr 2006 12:42:48 +0000 (12:42 +0000)
commit023e076d6f391b096e66f9d5bdfcfc8bbe3cb84a
treeb3d78497f99ce9a31972456a46c8c4cdeb823e32
parentb4947053933ac0b1a7aab299c573a151e5f0500f
parent1e1ada868cbcfe8153844d7375f38245aeb2d82d
merge of 1db2f2b8a272dbada8a2ce16756fbd5d1e2a143d
     and 2e6ce2c10f58ef5ccf8c16264fdf62c387da283c