From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 21 Jun 2007 03:43:21 +0000 (+0000)
Subject: merge of '6784a6b701f00708668a4025f803a9342e7ccbdf'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~42^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee4cd92f338ea11167845c50debc6b4c7e451f9;p=openembedded.git

Merge ... '6784a6b701f00708668a4025f803a9342e7ccbdf'
     and 'a1d9bb1b5ffce63159a1d8a542921bdbc87ec8d8'
---

5ee4cd92f338ea11167845c50debc6b4c7e451f9