merge of 'acd8498e4573491722380c035bd7b58de78410ee'
authorKoen Kooi <koen@openembedded.org>
Mon, 31 Jul 2006 11:46:42 +0000 (11:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 31 Jul 2006 11:46:42 +0000 (11:46 +0000)
     and 'd7cc6ec7ff432b7592af0d14fbe1777a3bebd543'


Trivial merge