From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 19 Aug 2006 16:31:16 +0000 (+0000)
Subject: merge of cb591f5b883733fa2368b93267c8b93a727fa2c7
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aa5739f1c590814f59a2614d4f0b65f315e0720;p=openembedded.git

merge of cb591f5b883733fa2368b93267c8b93a727fa2c7
     and fc7dbf68b690a52e902e149f664580d3174d52e9
---

8aa5739f1c590814f59a2614d4f0b65f315e0720