From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 15 Jan 2007 15:18:48 +0000 (+0000)
Subject: merge of '678b1e5c05a4cfa25000ad52b48967fdb1f47de9'
X-Git-Tag: Release-2010-05/1~9366^2~2^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da9c892043b06960916b10ad03d8ecdfafb7f4fe;p=openembedded.git

Merge ... '678b1e5c05a4cfa25000ad52b48967fdb1f47de9'
     and 'fd75df8ff294fcf1fad13e6435c871db140e5380'
---

da9c892043b06960916b10ad03d8ecdfafb7f4fe