From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 20 Oct 2006 09:53:04 +0000 (+0000)
Subject: merge of '3620468cc84d19eb4000fb2adf648ce594360b81'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~83^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a81633e35bf595208cf9f6631b460eb17d56bab4;p=openembedded.git

Merge ... '3620468cc84d19eb4000fb2adf648ce594360b81'
     and 'caeaa1c1178745edaf9e570da28905beabafc0fd'
---

a81633e35bf595208cf9f6631b460eb17d56bab4