From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 17 Jan 2006 16:18:24 +0000 (+0000)
Subject: merge of 9c6d2f9ed3be4745760b4dcd14811587f4acd623
X-Git-Tag: Release-2010-05/1~9453^2~2629^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d514cffa281374ea0320f256ae62d960893792c;p=openembedded.git

merge of 9c6d2f9ed3be4745760b4dcd14811587f4acd623
     and b78c38c1ca7715097407f79c1f432372e7b8c258
---

7d514cffa281374ea0320f256ae62d960893792c