From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 14 Nov 2007 10:56:02 +0000 (+0000)
Subject: merge of '4691fac16318391e3125e1a88e96b9003fa1c4f0'
X-Git-Tag: Release-2010-05/1~8405
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b016f9c2bd40fdcafd2ffeb563164ab08e80780c;p=openembedded.git

Merge ... '4691fac16318391e3125e1a88e96b9003fa1c4f0'
     and '9934077f8cc45499fe70c414041ee257c6f7b98d'
---

b016f9c2bd40fdcafd2ffeb563164ab08e80780c