From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Thu, 9 Oct 2008 22:24:49 +0000 (+0000)
Subject: merge of 'aa332b0757a7f250aec59dac51d57c4cdfda5e6e'
X-Git-Tag: Release-2010-05/1~5847
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5deda18914a97c792e468d8aeceec94867dd60c2;p=openembedded.git

Merge ... 'aa332b0757a7f250aec59dac51d57c4cdfda5e6e'
     and 'b74f88e907776bb75ebf406e06efc1fa0a2ea1c0'
---

5deda18914a97c792e468d8aeceec94867dd60c2