merge of '1571018373f9f6226bf0385c78d6dbc62289ee93'
authorKoen Kooi <koen@openembedded.org>
Sun, 9 Sep 2007 08:47:08 +0000 (08:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 9 Sep 2007 08:47:08 +0000 (08:47 +0000)
commitd6833d3ab6f6b0c4078c9d0c46cb9d5dd0faea58
treec4955d80ae8ffa567ee0dcd13946496cb5441583
parent6585e0f9da3a4218b7a0842447911ec3003bc064
parent6682bfdadd755f8011c50e8c598d245c3d49b268
Merge ... '1571018373f9f6226bf0385c78d6dbc62289ee93'
     and '2fcb43373fb4b8e1c8c28db1ee32e1981d35bfb6'