merge of '64a99c44cf4b94f829d2fb02ed7fb05a16da4669'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 11:11:42 +0000 (11:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 11:11:42 +0000 (11:11 +0000)
     and 'bb6c1f5981b1f6f71320c3c1635ef323edc2a9e1'


Trivial merge