merge of 'd8e93653bdd44929cd8b804051b01cad64bc4550'
authorKoen Kooi <koen@openembedded.org>
Mon, 2 Jul 2007 12:22:37 +0000 (12:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 2 Jul 2007 12:22:37 +0000 (12:22 +0000)
commit3f5c3d8a8b5f45d4f621d5a592b842aef8f564b5
treed64dd1a1ceef57b77ae14b13b37db0990c22029d
parent2c8c48334dfc9339373f86ba86ba3ec4b62acc4b
parent00b48919d080de5b7619ac58c231fa78627445ca
Merge ... 'd8e93653bdd44929cd8b804051b01cad64bc4550'
     and 'f273d173d517ba98778745b37b0f630d81deb1ee'