merge of '0c449bd860651c16124dcc0cc2cd07689c45f195'
authorKoen Kooi <koen@openembedded.org>
Mon, 7 Jul 2008 19:42:51 +0000 (19:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 7 Jul 2008 19:42:51 +0000 (19:42 +0000)
     and 'dd4d3e3ff0ada8bf5ea141fcdcf9a37e621fa46a'


Trivial merge