From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 6 Mar 2008 00:35:26 +0000 (+0000)
Subject: merge of '43c960d45911aef12f2312ce6684bc1c3678b4c1'
X-Git-Tag: Release-2010-05/1~7557
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84aa765fd29ff318d2ad15538d35928573d46be6;p=openembedded.git

Merge ... '43c960d45911aef12f2312ce6684bc1c3678b4c1'
     and 'fd24a981d47c073f1728f3aba7eaabcf9a2ac424'
---

84aa765fd29ff318d2ad15538d35928573d46be6