From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 21 Jun 2006 14:13:19 +0000 (+0000)
Subject: merge of 794196dd65f7f3765c599271625175daa1d20cde
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~11^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12078ec6590a4a7844829634e81270ee42f66988;p=openembedded.git

merge of 794196dd65f7f3765c599271625175daa1d20cde
     and 819d48f7dfdcf5e59b36b88b9b518d8d76d04f06
---

12078ec6590a4a7844829634e81270ee42f66988