merge of '915e7bca8f798ca0d2f6da81429ccae09aa97fd5'
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 18:25:06 +0000 (18:25 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 18:25:06 +0000 (18:25 +0000)
     and 'bb10d8a365ae5156ad44c564e8bb6e71c9ec65de'


Trivial merge