From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 10 Aug 2006 13:42:00 +0000 (+0000)
Subject: merge of 'ebfa533fbc0b4ebe4011d0117987194f59487d33'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1^2^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7c025c5a1a08fb87f4e9681db10b10f243ad343;p=openembedded.git

Merge ... 'ebfa533fbc0b4ebe4011d0117987194f59487d33'
     and 'f51ee4ac99567fc6d25a7185a674fe9c9b48dd4d'
---

e7c025c5a1a08fb87f4e9681db10b10f243ad343