From: Koen Kooi <koen@openembedded.org>
Date: Sat, 14 Jun 2008 08:45:53 +0000 (+0000)
Subject: merge of 'ae80749e4b78bcd1a09605ab422d6bca3ed0eac9'
X-Git-Tag: Release-2010-05/1~6714^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=261421b2c150e2758ec6b4812c251512f4bb5895;p=openembedded.git

Merge ... 'ae80749e4b78bcd1a09605ab422d6bca3ed0eac9'
     and 'd942dfba8b566098a8d2eaed687295691c4716bc'
---

261421b2c150e2758ec6b4812c251512f4bb5895