merge of '28f5b60141cb1b866dcc89f47a6599c6b64dfbc0'
authorKoen Kooi <koen@openembedded.org>
Fri, 28 Dec 2007 16:37:02 +0000 (16:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 28 Dec 2007 16:37:02 +0000 (16:37 +0000)
     and 'd322189b0c434dffdfdb6b22847f6660c0e95ac6'


Trivial merge