merge of '34c552438e2e3487f826b3198c4bdf7e1445e77e'
authorKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 17:32:55 +0000 (17:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 17:32:55 +0000 (17:32 +0000)
     and '50cf42d4e0e7f04c4f5e02dbeeaac10fd228c58d'


Trivial merge