From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 25 Oct 2007 09:59:20 +0000 (+0000)
Subject: merge of '9ff0a101d7888656da5ef763d89e174caa81929d'
X-Git-Tag: Release-2010-05/1~8454^2~138
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3368a25f2087798de52005aacb7b532e516d380;p=openembedded.git

Merge ... '9ff0a101d7888656da5ef763d89e174caa81929d'
     and 'c03b94ac8fbf026789f1b11941f374e38bc33b98'
---

d3368a25f2087798de52005aacb7b532e516d380