From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 29 Jun 2006 15:48:20 +0000 (+0000)
Subject: merge of aa18ee8eb2023a276ade17e86029f95c7bd44e9b
X-Git-Tag: Release-2010-05/1~9453^2~1403
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06a933e4b57759fe9924a4a66aedbb71e9112d1d;p=openembedded.git

merge of aa18ee8eb2023a276ade17e86029f95c7bd44e9b
     and c7ec779da9615eb36704166a03857d716d9a2908
---

06a933e4b57759fe9924a4a66aedbb71e9112d1d