merge of '289a0ae2ef5b937f19a659d56d37d2b368af059b'
authorKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 11:08:36 +0000 (11:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 27 Aug 2007 11:08:36 +0000 (11:08 +0000)
     and '51d9e57dcb74a214f91e70c080c84da43520598b'


Trivial merge