merge of '3543fa4aaa5f07ff77ae69c6724d4e466b02ae8c'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 09:09:43 +0000 (09:09 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 09:09:43 +0000 (09:09 +0000)
commit4258544536f747f3060db97f474805a006609bcd
treed7193c04b9030694afa9f86535e02831288f71a6
parentb17a019844e5d5f2de10a086b89101b38b09faa5
parentafff0f856908bb8bb6633bec2a6163b3f3184646
Merge ... '3543fa4aaa5f07ff77ae69c6724d4e466b02ae8c'
     and 'a481e13be451a5614f904af720b3bc6f26bb6ce7'