From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Mar 2007 02:39:26 +0000 (+0000)
Subject: merge of '8b02ed625372878189c957c2c7819f780350ab61'
X-Git-Tag: Release-2010-05/1~8868^2~875^2~10^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f5de8ae963a1fea5e0d18472a02aab3f6aca3ff;p=openembedded.git

Merge ... '8b02ed625372878189c957c2c7819f780350ab61'
     and 'fb808adcfea54d1d3fc262b6ee51bee107cf33dc'
---

4f5de8ae963a1fea5e0d18472a02aab3f6aca3ff