From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 20 Sep 2007 13:35:46 +0000 (+0000)
Subject: merge of '4c89fe83f0f196ebd6c0ae47cf90bf2134df3c1e'
X-Git-Tag: Release-2010-05/1~8625^2~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b20643cf56d475b1c39c20dffc7f46fb8fc7d52;p=openembedded.git

Merge ... '4c89fe83f0f196ebd6c0ae47cf90bf2134df3c1e'
     and 'eee5593805c1b699d11b41c5bf39860df0d24ca6'
---

6b20643cf56d475b1c39c20dffc7f46fb8fc7d52