merge of 'a806a9f3048bf953ea29faffb714688ab1a8d4d8'
authorKoen Kooi <koen@openembedded.org>
Wed, 3 Oct 2007 12:38:36 +0000 (12:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 3 Oct 2007 12:38:36 +0000 (12:38 +0000)
     and 'b197b98e05323ddd6e2f04f723ec87f58fe81d3b'


Trivial merge