From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 24 Jan 2008 17:02:51 +0000 (+0000)
Subject: merge of 'bc23cf53ce799d3e52d33fa659150040636e3134'
X-Git-Tag: Release-2010-05/1~7838^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f68ff6a19d85b3f7dd8f2cfd72840e340fa0b328;p=openembedded.git

Merge ... 'bc23cf53ce799d3e52d33fa659150040636e3134'
     and 'c0a3e474625678b13727e12b833983f6e3389de1'
---

f68ff6a19d85b3f7dd8f2cfd72840e340fa0b328