From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Sep 2006 16:46:17 +0000 (+0000)
Subject: merge of 1822d1a8f0fa2b6eaefbe7d5d0caa555299d4185
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~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f696cd89757de08719c7b2d1ad2295a34b18365;p=openembedded.git

merge of 1822d1a8f0fa2b6eaefbe7d5d0caa555299d4185
     and 4e7386151d1273724db821c550dbd7106a83f5ab
---

8f696cd89757de08719c7b2d1ad2295a34b18365