From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 26 Jun 2006 13:32:10 +0000 (+0000)
Subject: merge of 2c58b60e1d3b3e6180e692b5ecb380645848d3f6
X-Git-Tag: Release-2010-05/1~9453^2~1421^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c97f5ec61ca676101a2e8623344ea5bd3b4a541;p=openembedded.git

merge of 2c58b60e1d3b3e6180e692b5ecb380645848d3f6
     and d720748eefecadc42fdb329ec2dd5eea284c11ba
---

2c97f5ec61ca676101a2e8623344ea5bd3b4a541