From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 3 Sep 2007 14:20:20 +0000 (+0000)
Subject: merge of '2d05a6d4c8545b71cddf93011420891bf70fb47e'
X-Git-Tag: Release-2010-05/1~8718^2~20^2~21^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c570ae9c1f668acd8499b9c5849235ffd77dd8;p=openembedded.git

Merge ... '2d05a6d4c8545b71cddf93011420891bf70fb47e'
     and 'a5a7ee9814548b1e054d96cea845556c4b5c39e9'
---

e3c570ae9c1f668acd8499b9c5849235ffd77dd8