merge of 'be8a841a837b3b065542075896aeb82facff500c'
authorKoen Kooi <koen@openembedded.org>
Fri, 27 Apr 2007 13:59:01 +0000 (13:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 27 Apr 2007 13:59:01 +0000 (13:59 +0000)
     and 'd8ae1481396d70f1488353a90f5389747f7be0b2'


Trivial merge