From: Graeme Gregory <dp@xora.org.uk>
Date: Sat, 12 Aug 2006 22:39:21 +0000 (+0000)
Subject: merge of '9e98fb14bc16730c2bbc97c1720259cb479ac8fa'
X-Git-Tag: Release-2010-05/1~9453^2~968^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ac305d7bf4f0cae2c8486470165598b402d9002;p=openembedded.git

Merge ... '9e98fb14bc16730c2bbc97c1720259cb479ac8fa'
     and 'b63cff7dc0ce768b721311fb1eca7e9ef45e7ed9'
---

7ac305d7bf4f0cae2c8486470165598b402d9002