From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Mon, 6 Oct 2008 19:18:06 +0000 (+0000)
Subject: merge of 'a8f3f61cfe31f5cb506de603a9fe0b7ddacc316f'
X-Git-Tag: Release-2010-05/1~5861^2~4^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3455a14e2e57d3f2c005df04900741da9e93ce0d;p=openembedded.git

Merge ... 'a8f3f61cfe31f5cb506de603a9fe0b7ddacc316f'
     and 'ec2835e0caacbf9d2e48582fc02e6b933292fd65'
---

3455a14e2e57d3f2c005df04900741da9e93ce0d