From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 19 Oct 2006 10:48:15 +0000 (+0000)
Subject: merge of 7d9d43a22af37a8b4ac0bfcbea925695287659e7
X-Git-Tag: Release-2010-05/1~9453^2~567^2~98^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=275c7f4eec3ace85d09ff95c4b41468b2c4c8dab;p=openembedded.git

merge of 7d9d43a22af37a8b4ac0bfcbea925695287659e7
     and 91bf3046a7b6ef29616d05dbbd8897b75fdf8d13
---

275c7f4eec3ace85d09ff95c4b41468b2c4c8dab