merge of '6516a85d1d78f28686ffc271f1b433d8bc839bd1'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 16:55:37 +0000 (16:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 16:55:37 +0000 (16:55 +0000)
commit5190f828692ee3f0c1211ce600f5edfe3ba14daa
treee8f6dcfd8ac9bddd9a2d119980ac0ce365656ccf
parent1eef6ac18de15ea845b146b1624fcc1f1c4faea2
parent06f56c824b07049b7ecbe4d896ea4ff43f0a6f79
Merge ... '6516a85d1d78f28686ffc271f1b433d8bc839bd1'
     and 'df082d3d98bc922e6be0b10b2470f6fa81c5dd64'