merge of '0a57d791817bb802f8d5d76a1f72267f1b8f3824'
authorKoen Kooi <koen@openembedded.org>
Mon, 12 Nov 2007 20:14:06 +0000 (20:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 12 Nov 2007 20:14:06 +0000 (20:14 +0000)
     and '60523827594e8dff880897c63c20ce4b5515bb3e'


Trivial merge