From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 4 Apr 2006 21:15:28 +0000 (+0000)
Subject: merge of 4ad70d03f3a19dce2f2582ea1b294336864413d6
X-Git-Tag: Release-2010-05/1~9453^2~2096^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e95c430759dabced92e1605456d976e49cbcffb3;p=openembedded.git

merge of 4ad70d03f3a19dce2f2582ea1b294336864413d6
     and f175718fb5bde3e7aeae50739efad8691f30c81a
---

e95c430759dabced92e1605456d976e49cbcffb3