merge of 'c1ea3a8ae4f9e7d4be16a51f112cef674a5306d2'
authorKoen Kooi <koen@openembedded.org>
Mon, 8 Oct 2007 09:36:59 +0000 (09:36 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 8 Oct 2007 09:36:59 +0000 (09:36 +0000)
     and 'd8fef75e4f14930650c56b6cce60305fe236f93e'


Trivial merge