From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 11 Apr 2007 15:57:43 +0000 (+0000)
Subject: merge of '7861396822409ca6c3e24762209c49eec2b2d690'
X-Git-Tag: Release-2010-05/1~8868^2~707
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaedfb448dcfd455f07f2f0889e40a5b8edece9c;p=openembedded.git

Merge ... '7861396822409ca6c3e24762209c49eec2b2d690'
     and 'a97e0415ed13e5b5fd6dd68b390a81a55f0cad34'
---

aaedfb448dcfd455f07f2f0889e40a5b8edece9c