From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 23 Mar 2006 10:21:51 +0000 (+0000)
Subject: merge of 1a896e8bc4995403afa45f684796b5d56c8e5198
X-Git-Tag: Release-2010-05/1~9453^2~2152
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22a883bce5ed668de572d430ac5a03ece16f0458;p=openembedded.git

merge of 1a896e8bc4995403afa45f684796b5d56c8e5198
     and 4e45961e2b4e4c3455a9d567510fc4a19841bbe5
---

22a883bce5ed668de572d430ac5a03ece16f0458