merge of '1baac115ff1ee3cfa594ac8bdb5a672342a18c6b'
authorKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 10:00:58 +0000 (10:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 10:00:58 +0000 (10:00 +0000)
     and '3d41c4823011988b4e4758eb112e35cca8f29b7f'


Trivial merge