From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 20 Mar 2006 12:20:09 +0000 (+0000)
Subject: merge of da1dc40350663056197750a19f00a46d20e267bf
X-Git-Tag: Release-2010-05/1~9453^2~2202
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae5317921527686b3a0ec41e0e86cd5cdbd973da;p=openembedded.git

merge of da1dc40350663056197750a19f00a46d20e267bf
     and eef84004dea20080082b6e55d342f2a6fbe75b8e
---

ae5317921527686b3a0ec41e0e86cd5cdbd973da