From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 25 Aug 2008 19:44:33 +0000 (+0000)
Subject: merge of 'b74bbaef312bef5b91193f9733ecea39b3427e18'
X-Git-Tag: Release-2010-05/1~6245
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45ff426346539ef0fc64ff8ce1d62991d9f89549;p=openembedded.git

Merge ... 'b74bbaef312bef5b91193f9733ecea39b3427e18'
     and 'd800abb6a82b493cb7014046a6c4a2db09d3b5e4'
---

45ff426346539ef0fc64ff8ce1d62991d9f89549