merge of 'ae80749e4b78bcd1a09605ab422d6bca3ed0eac9'
authorKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 08:45:53 +0000 (08:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 08:45:53 +0000 (08:45 +0000)
commit261421b2c150e2758ec6b4812c251512f4bb5895
tree05d1fa8d7e109d215bede91b36955b096397004d
parentd63e35340a6a2b0c7a7e049e921d624469bbd0dd
parente458e31a792e1ffae09b971e765094b345f3dcd8
Merge ... 'ae80749e4b78bcd1a09605ab422d6bca3ed0eac9'
     and 'd942dfba8b566098a8d2eaed687295691c4716bc'