From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 23 Jan 2008 11:58:39 +0000 (+0000)
Subject: merge of '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
X-Git-Tag: Release-2010-05/1~7838^2~15^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad11cf6e384154babfd4be9bbb94388426cae35d;p=openembedded.git

Merge ... '558d7f8556530ca23dc6e4b7d687d6727d3a7397'
     and 'e2acd7ca2afd3b646c7321798cc2ae3307bd951f'
---

ad11cf6e384154babfd4be9bbb94388426cae35d