merge of '04f4f8d195ec1a23e53f2158cf15535337100d4f'
authorKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 18:01:31 +0000 (18:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 18:01:31 +0000 (18:01 +0000)
     and 'a2037f5a81477506111846d9e8e8c70baee9a86a'


Trivial merge