From: Graeme Gregory <dp@xora.org.uk>
Date: Sat, 12 Aug 2006 22:40:19 +0000 (+0000)
Subject: merge of 'c78970f2b600a47675f4fa927b768e98773f5194'
X-Git-Tag: Release-2010-05/1~9453^2~968
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1a7c91de824e6eb1f9af6d3d2480888de903d2c;p=openembedded.git

Merge ... 'c78970f2b600a47675f4fa927b768e98773f5194'
     and 'c828d0949f0887cd22da336a7dc37e547064f102'
---

f1a7c91de824e6eb1f9af6d3d2480888de903d2c