From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 14 Mar 2008 16:51:19 +0000 (+0000)
Subject: merge of '68b307acdcebbfa76e48b811ca400ec5c07e768c'
X-Git-Tag: Release-2010-05/1~7106^2^2~18^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2262fe4875af280fd5606778a195efa677202fb;p=openembedded.git

Merge ... '68b307acdcebbfa76e48b811ca400ec5c07e768c'
     and '95d7aafb111c8d8a347b6e51672855a431552234'
---

b2262fe4875af280fd5606778a195efa677202fb