From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 12 Jul 2006 13:32:30 +0000 (+0000)
Subject: merge of 8b41db425f053a0c79ef7f41b7f70619b23390d7
X-Git-Tag: Release-2010-05/1~9453^2~1240
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=060802a060579c858748b6ef5f9075c449a3c861;p=openembedded.git

merge of 8b41db425f053a0c79ef7f41b7f70619b23390d7
     and 8d2a59cf6417a38e14b99b0e8080564c6c5fbdc2
---

060802a060579c858748b6ef5f9075c449a3c861