From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 21 Jul 2005 10:19:38 +0000 (+0000)
Subject: merge of 45523d76f8ab21f3cf758dddb065ea69352fdda6
X-Git-Tag: Release-2010-05/1~9453^2~4105
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57c61f283d2bb9968b5f9b3b3c32693056b3caf2;p=openembedded.git

merge of 45523d76f8ab21f3cf758dddb065ea69352fdda6
     and 68eb66f0775ddfc98a09a35fe521ff023060b754
---

57c61f283d2bb9968b5f9b3b3c32693056b3caf2