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

merge of 7804c1cfc20b7850616d5e9f63fbdf68a3245ee1
     and a99a2bd3750b333d0de75aa53e49da8e5fc3d767
---

00a93ee65b3e7262b0a25afbf99bfabd1d23175b