From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 17 Aug 2006 20:18:09 +0000 (+0000)
Subject: merge of 45b9c31faf5ea0a1f222543e7f19d257ab139bb5
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a64555aced084fb223bc38f7c829d01a6f993d7;p=openembedded.git

merge of 45b9c31faf5ea0a1f222543e7f19d257ab139bb5
     and f5bdc770e5f516fdff72ea09c66df9591451f294
---

6a64555aced084fb223bc38f7c829d01a6f993d7