From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 3 Feb 2008 00:13:43 +0000 (+0000)
Subject: merge of 'bb3574ca77780e28d3528182eaeb7cda963c4974'
X-Git-Tag: Release-2010-05/1~7765^2~7^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05d160f70bd8dd3cafdac0d9824c79495be2e6f2;p=openembedded.git

Merge ... 'bb3574ca77780e28d3528182eaeb7cda963c4974'
     and 'eea0b13e3079e07cf547a5690026863e07e011bf'
---

05d160f70bd8dd3cafdac0d9824c79495be2e6f2