merge of '45d7f2962e16b25cf29da125c1645096b5d7fe7e'
authorKoen Kooi <koen@openembedded.org>
Mon, 14 Jul 2008 08:39:13 +0000 (08:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 14 Jul 2008 08:39:13 +0000 (08:39 +0000)
commit1bb6810f0190c114aac654627547808b3f301fab
tree8a732b784375be8eb39c8fb877c0c3627689a070
parent3b2a3f2b9068f9ee61070efe2ea0ab660cf5a1f3
parent1b0cbb809e09eddff243e874edff54a4b0c25626
Merge ... '45d7f2962e16b25cf29da125c1645096b5d7fe7e'
     and 'aa0f52125342f4a172e931fd7a8aa4d951d9f7ec'