From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 6 Jul 2006 10:27:57 +0000 (+0000)
Subject: merge of 02ca6b9a1133a17f5e162779af2eaee48c4115dc
X-Git-Tag: Release-2010-05/1~9453^2~1329
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=536d14e5749ab489c018f30abad07ac93dadc4b6;p=openembedded.git

merge of 02ca6b9a1133a17f5e162779af2eaee48c4115dc
     and 5beb3d8e6566e09fca5c9db902bd8db27eb92282
---

536d14e5749ab489c018f30abad07ac93dadc4b6