merge of '54413dcee93082ea892457c360c17618573085e5'
authorKoen Kooi <koen@openembedded.org>
Tue, 27 Mar 2007 18:28:36 +0000 (18:28 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 27 Mar 2007 18:28:36 +0000 (18:28 +0000)
     and 'a20c57790313df2a879b212ea94a0b1f65411301'


Trivial merge