From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 Aug 2006 07:46:16 +0000 (+0000)
Subject: merge of 18b9ec04d7f267ce07ff8f28fbbe478a75728854
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^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2~3^2^2~2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1780fd7ecd3d50ddcf86f03a648a489181f94bf2;p=openembedded.git

merge of 18b9ec04d7f267ce07ff8f28fbbe478a75728854
     and 7ff3301c1054623d64c67d368c1997f39db2939f
---

1780fd7ecd3d50ddcf86f03a648a489181f94bf2