From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 10 Jul 2006 12:29:44 +0000 (+0000)
Subject: merge of 08b99a6246391bc67af5422397346b95d3d3b3e3
X-Git-Tag: Release-2010-05/1~9453^2~1266
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c7ce92f6dfecfcd5c858838c296f86a93bd872;p=openembedded.git

merge of 08b99a6246391bc67af5422397346b95d3d3b3e3
     and f3515be6618dd23c0a5917c27c9607c052d6df83
---

85c7ce92f6dfecfcd5c858838c296f86a93bd872