merge of '32c0fccda6ab3bd86ccbdddf72299fd683c82f91'
authorKoen Kooi <koen@openembedded.org>
Wed, 24 Sep 2008 08:08:01 +0000 (08:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 24 Sep 2008 08:08:01 +0000 (08:08 +0000)
     and 'f53c3029d838484abd7ce468cd46b0cffe6d0921'


Trivial merge