From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 7 May 2006 17:52:53 +0000 (+0000)
Subject: merge of d531cba8982784eb684baddbaad006324615e340
X-Git-Tag: Release-2010-05/1~9453^2~1757
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01307093a7a3978f49d4e34087ef5df5f93e5933;p=openembedded.git

merge of d531cba8982784eb684baddbaad006324615e340
     and eeb34f63bfdd65160ae264e87e5edafeea4623c6
---

01307093a7a3978f49d4e34087ef5df5f93e5933