merge of 'c1a64808fc49d61ea2634c0c011011da9e5a7886'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:29 +0000 (20:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:29 +0000 (20:57 +0000)
     and 'c6503f659bf477fbd684cf50b9a73db2e7af3bbc'


Trivial merge