From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 30 May 2006 14:23:59 +0000 (+0000)
Subject: merge of 2da9b96cdb36ca182caf27f836faef1078572f95
X-Git-Tag: Release-2010-05/1~9453^2~1558^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62d8a632d009598ea41260a49458056ef39ffb68;p=openembedded.git

merge of 2da9b96cdb36ca182caf27f836faef1078572f95
     and 47d0a86844b0af01207eaf860b38e3902c54e12c
---

62d8a632d009598ea41260a49458056ef39ffb68