merge of '0530cbc2e708bd334c3cfce29e493b23ac334eae'
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 11:50:53 +0000 (11:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 29 Mar 2007 11:50:53 +0000 (11:50 +0000)
     and 'b29c23e0d633fa6ee3a025145df31e696fcc3cd3'


Trivial merge