From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 28 Feb 2008 12:09:46 +0000 (+0000)
Subject: merge of '2c34202b0dfd11794a79da2cd891a88adbfcea48'
X-Git-Tag: Release-2010-05/1~7572^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06312eba71432aa2d9e0ed64ebacefd09b12b245;p=openembedded.git

Merge ... '2c34202b0dfd11794a79da2cd891a88adbfcea48'
     and 'fd02aa1602a7d21248a66f67a25e6435c8443a48'
---

06312eba71432aa2d9e0ed64ebacefd09b12b245