From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 28 Nov 2005 21:05:03 +0000 (+0000)
Subject: merge of 264f8902da57233dad1ce1345495ca9e2fa6e2d4
X-Git-Tag: Release-2010-05/1~9453^2~3002^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37bfd44995253ca84065f0d4326c24ab14f2b1ae;p=openembedded.git

merge of 264f8902da57233dad1ce1345495ca9e2fa6e2d4
     and 4fb1223f75836093b262b92d3533307a1300b174
---

37bfd44995253ca84065f0d4326c24ab14f2b1ae