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)
     and 'a481e13be451a5614f904af720b3bc6f26bb6ce7'


Trivial merge