merge of '7ffa21c0488fe0c49d50573aa879df722ab0c3a5'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 13:56:00 +0000 (13:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 13:56:00 +0000 (13:56 +0000)
     and 'f7b4e3c2936aace229411ee357133e0f675f04e7'


Trivial merge