From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 9 May 2008 15:33:24 +0000 (+0000)
Subject: merge of '4e808662b364403781cd4e899198db521c13afc9'
X-Git-Tag: Release-2010-05/1~6970^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c86351c17010dc465a11c3a81ed442ac2f33b360;p=openembedded.git

Merge ... '4e808662b364403781cd4e899198db521c13afc9'
     and '88288139695df3e5cc87ecfe407fbad1d201c362'
---

c86351c17010dc465a11c3a81ed442ac2f33b360