From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 8 Mar 2008 12:02:37 +0000 (+0000)
Subject: merge of '42eff26099cde8822773944e3b244f74387ef7cc'
X-Git-Tag: Release-2010-05/1~7538^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcb50855fe95922a2fc428634daa9bf9ec5aae27;p=openembedded.git

Merge ... '42eff26099cde8822773944e3b244f74387ef7cc'
     and 'd2b1667a830019b8580dcf05a70b8e95329e9e25'
---

fcb50855fe95922a2fc428634daa9bf9ec5aae27