merge of '63713e447c41c83bf22dd769c1445c4ccae3c8e8'
authorKoen Kooi <koen@openembedded.org>
Mon, 7 May 2007 12:12:25 +0000 (12:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 7 May 2007 12:12:25 +0000 (12:12 +0000)
     and '932420dfb0d71d98430d944c3a0063c26cf94d70'


Trivial merge