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

Merge ... '0af36442f2b5ad5f505d802f19a109562afaee66'
     and '0dee125d6c77c5911cd60676bb87681b7565e13f'
---

62be5e3f63fce688707089d93f47953ab96df4e6