From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 2 Nov 2007 12:25:27 +0000 (+0000)
Subject: merge of '2cc1d45d9437bdd14d505b2d7872c95ac87a0157'
X-Git-Tag: Release-2010-05/1~8454^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c23b04b9a91d3d1b32871d0f2d27260caf42f03a;p=openembedded.git

Merge ... '2cc1d45d9437bdd14d505b2d7872c95ac87a0157'
     and 'ae7352b220b0e0099308d35ee2853b9ba371ca64'
---

c23b04b9a91d3d1b32871d0f2d27260caf42f03a