From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Sat, 2 Aug 2008 20:17:43 +0000 (+0000)
Subject: merge of '987c8d92ee736e8162fb230be7d61936f9640e8d'
X-Git-Tag: Release-2010-05/1~6382^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae05d33251c158c4f6796c7a866e591d7cccb6d5;p=openembedded.git

Merge ... '987c8d92ee736e8162fb230be7d61936f9640e8d'
     and 'ccb7f1f9255a881fe31045e96a80be35d59827a8'
---

ae05d33251c158c4f6796c7a866e591d7cccb6d5