From: Koen Kooi <koen@openembedded.org>
Date: Tue, 12 Aug 2008 14:19:53 +0000 (+0000)
Subject: merge of '574f948e2e34c92b8569814f4622a4be67664b8b'
X-Git-Tag: Release-2010-05/1~6333^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=291ac197985b8fe9d87b4c07c8072b33dbc6a495;p=openembedded.git

Merge ... '574f948e2e34c92b8569814f4622a4be67664b8b'
     and 'e10b25001ecd4fdb4051e6efb417dacc1dd2b985'
---

291ac197985b8fe9d87b4c07c8072b33dbc6a495