merge of 'da2adc92c99cff2b86889236f56aa4071a73c158'
authorKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 13:38:02 +0000 (13:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 13:38:02 +0000 (13:38 +0000)
     and 'e9758ef5cc8f5e67a47f0490c6a6040a07926c75'


Trivial merge