From: OpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Date: Wed, 20 Jun 2007 14:14:00 +0000 (+0000)
Subject: merge of '2e808e7d7d04be00150c9a9ed0384baa6c7114f1'
X-Git-Tag: Release-2010-05/1~8868^2~296^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18f3936c10b0a7dc3bb32d4dd267ffad3fcd4be9;p=openembedded.git

Merge ... '2e808e7d7d04be00150c9a9ed0384baa6c7114f1'
     and '88fc6a7d5e7c17322b154bdd942535cbca085e18'
---

18f3936c10b0a7dc3bb32d4dd267ffad3fcd4be9