merge of '2df98cb93e1c3ab67c675e3f11ef036ea57dd19b'
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Aug 2008 15:47:12 +0000 (15:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 22 Aug 2008 15:47:12 +0000 (15:47 +0000)
     and 'ba9a800ebd8fd6f90db1e022cd9a342c69339bc2'


Trivial merge