From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Tue, 7 Oct 2008 22:07:07 +0000 (+0000)
Subject: merge of '434c4a5a7f3ee7f462db798e27cc0f7c2fd7458f'
X-Git-Tag: Release-2010-05/1~5861^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8e1f7d7523ab5cd6154bc585cd90c1fd24f89dd;p=openembedded.git

Merge ... '434c4a5a7f3ee7f462db798e27cc0f7c2fd7458f'
     and 'aa5ca25b387398015df6ff4983a31df9f74a3dff'
---

a8e1f7d7523ab5cd6154bc585cd90c1fd24f89dd