merge of '5aa0bfca72176a539f36057d142b7fbc248c3987'
authorKoen Kooi <koen@openembedded.org>
Mon, 20 Nov 2006 09:37:38 +0000 (09:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 20 Nov 2006 09:37:38 +0000 (09:37 +0000)
     and '7f11ce9c6210928dc642453f15126ac6ff44f108'


Trivial merge