From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 22 Jul 2005 09:40:50 +0000 (+0000)
Subject: merge of 141bf23dcf6e128a2155bf385cf3dc153be58cbb
X-Git-Tag: Release-2010-05/1~9453^2~4086^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c8842ef4de45230165b92b9bd70100594927e5;p=openembedded.git

merge of 141bf23dcf6e128a2155bf385cf3dc153be58cbb
     and e2b4fef7a158b3669ddc135bad1d8b23c7a59015
---

85c8842ef4de45230165b92b9bd70100594927e5