From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 6 Aug 2008 09:42:19 +0000 (+0000)
Subject: merge of '0f7564fadffb99d20d47c3f490dfd75ce830ba2a'
X-Git-Tag: Release-2010-05/1~6347^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f25a436ecdfeb3398745aa71841fc78a52b493b2;p=openembedded.git

Merge ... '0f7564fadffb99d20d47c3f490dfd75ce830ba2a'
     and 'f560dfa2d097d4a4b936e073f125c30f8f522a07'
---

f25a436ecdfeb3398745aa71841fc78a52b493b2