From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Sep 2006 09:46:27 +0000 (+0000)
Subject: merge of 39edb7cb1f59f721cbbef84d4663c268586f700f
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=208e81077e0ddba981b7798df7817b17728e3193;p=openembedded.git

merge of 39edb7cb1f59f721cbbef84d4663c268586f700f
     and 775abaa4c33cb315c1cf7741da44b9517133d401
---

208e81077e0ddba981b7798df7817b17728e3193