From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 3 Oct 2007 12:43:56 +0000 (+0000)
Subject: merge of '3c4f69f9ba263ccd43af4bc408f5a6cb8337233a'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75ca14aea7cb692737bf5a51933fbaf56f46fcbc;p=openembedded.git

Merge ... '3c4f69f9ba263ccd43af4bc408f5a6cb8337233a'
     and 'a5257d19c1dd5c319436cc57245e4ac23ffcd467'
---

75ca14aea7cb692737bf5a51933fbaf56f46fcbc