From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 13 Nov 2007 15:53:40 +0000 (+0000)
Subject: merge of '6ef8b55fe81238d3e4be14ca1cbf2f23ab7ee8a1'
X-Git-Tag: Release-2010-05/1~8410
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1f4717b049f0871ed86d28e305c1268221b4e40;p=openembedded.git

Merge ... '6ef8b55fe81238d3e4be14ca1cbf2f23ab7ee8a1'
     and '92881558b2b1ee88b0d0bb08428f57e67a1250c6'
---

c1f4717b049f0871ed86d28e305c1268221b4e40