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)
commitb87bb3930ca83454c0fb1d242c2dfe77be154146
tree8ef24cc7466d0a2dc9261a910cd717d46fd56e23
parentde2533a6a8aef13f003384d1654980bbb434b67b
parent9bde98efe0f773f113eefe26762c2fd1bcc64b16
Merge ... '63713e447c41c83bf22dd769c1445c4ccae3c8e8'
     and '932420dfb0d71d98430d944c3a0063c26cf94d70'