merge of '224b10a52b5c05999e18cb7bfe86f5706f939f89'
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 20:39:37 +0000 (20:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 20:39:37 +0000 (20:39 +0000)
     and '8b2e0e9b5ba615d4e80a7932813416e9775c6be9'


Trivial merge