From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 18 Aug 2007 05:20:51 +0000 (+0000)
Subject: merge of '5f324e98b61ec50554d929eb59723aaef495ef64'
X-Git-Tag: Release-2010-05/1~8936
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc0e2c05e697f3b63373ba7756432f047456cc0f;p=openembedded.git

Merge ... '5f324e98b61ec50554d929eb59723aaef495ef64'
     and 'f857f14193d6f1cf2150da9e6a84070b69b7dd1d'
---

cc0e2c05e697f3b63373ba7756432f047456cc0f