From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Sep 2006 12:46:40 +0000 (+0000)
Subject: merge of 388eb4296cf35f3d9f3915cea0c4bdaf68a97981
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5^2~1^2^2~1^2^2~2^2~1^2^2^2^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2a118a76a572dd964cd69fbe41c331707b343e3;p=openembedded.git

merge of 388eb4296cf35f3d9f3915cea0c4bdaf68a97981
     and 65c7ffed2b7b66691d948c6ec4976322dd9a0da2
---

b2a118a76a572dd964cd69fbe41c331707b343e3