merge of '5218b291289ff56a8d3f0caa1ddf13f84dfe516f'
authorKoen Kooi <koen@openembedded.org>
Sun, 18 Nov 2007 10:41:20 +0000 (10:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 18 Nov 2007 10:41:20 +0000 (10:41 +0000)
commit08ecde71ca7eae9a678363c357807a50fe71fe23
treea08a5aaaa13a9648327fe85a7e56d081cbb82fa7
parentf672849794483e1c38fa959548894dcc479b1485
parente59a401be4d7aad700710505334cba4a1d6110fd
Merge ... '5218b291289ff56a8d3f0caa1ddf13f84dfe516f'
     and '8e25ce126ed9c9216d456d96f115eadd784f8157'