merge of '21cc63203b5df2e8d90f0a909db0ffa185502b72'
authorKoen Kooi <koen@openembedded.org>
Mon, 30 Jul 2007 11:31:03 +0000 (11:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 30 Jul 2007 11:31:03 +0000 (11:31 +0000)
     and 'f87475ccf1fd18294a9edb79090422cc8f201753'


Trivial merge