From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 4 Feb 2008 17:14:54 +0000 (+0000)
Subject: merge of '29817a260e6a9fe06810b70340557576d2be9f57'
X-Git-Tag: Release-2010-05/1~7763^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63f313ebf1b7615e7e2ad7f2fb3c294d1e2c709e;p=openembedded.git

Merge ... '29817a260e6a9fe06810b70340557576d2be9f57'
     and '7a8c7842dfe3f66d78bbcc7b5db97559d02147cd'
---

63f313ebf1b7615e7e2ad7f2fb3c294d1e2c709e