From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Nov 2005 16:03:24 +0000 (+0000)
Subject: merge of c8607c1fd6f2272b8b57d41db45cc4ee916f9fed
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b6507f864f059a87049fd41ee3ddb4eeda5e01d;p=openembedded.git

merge of c8607c1fd6f2272b8b57d41db45cc4ee916f9fed
     and f7da4369dc264ba4cc88a416a2763402bf92d133
---

2b6507f864f059a87049fd41ee3ddb4eeda5e01d