merge of '752a299fb6dac3f47f04ff23bc60eb3cbf0fcc44'
authorKoen Kooi <koen@openembedded.org>
Wed, 13 Jun 2007 08:34:04 +0000 (08:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 13 Jun 2007 08:34:04 +0000 (08:34 +0000)
     and '8119e9385c70c493e4f797e81537765d2dd31127'


Trivial merge