merge of '91e857f4e4f0139bbea26d8f79434e22885acf30'
authorKoen Kooi <koen@openembedded.org>
Wed, 18 Oct 2006 08:49:53 +0000 (08:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 18 Oct 2006 08:49:53 +0000 (08:49 +0000)
     and 'c4b26d4a928a1fca0cf7295a0c9ce96e4e9d04ba'


Trivial merge