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

Merge ... '0fb63a3a1c21083e64e1fc35d8abe83eabdecfe6'
     and 'a7d0911cc51bd1eb437c71feab04198858ad16b8'
---

2e100a4a97a75b7ea8c6d730d6c1091a27df9418