merge of 'a98e93456176d74c80a713ff53caef9f3ad4027e'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Jul 2007 12:45:04 +0000 (12:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Jul 2007 12:45:04 +0000 (12:45 +0000)
     and 'cea8793a75c42eb3027ed8b7aac39a6bd8cdc931'


Trivial merge