From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 1 Nov 2005 15:44:04 +0000 (+0000)
Subject: merge of 348f3f6524cd73a696d15a5f3d04dd4c89b66fdf
X-Git-Tag: Release-2010-05/1~9453^2~3152^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=135d7c612a713db6d6180623b8c4f68499b9ab2e;p=openembedded.git

merge of 348f3f6524cd73a696d15a5f3d04dd4c89b66fdf
     and f99c13adcfcf9d39261b5888ee3a2e9e5700bc83
---

135d7c612a713db6d6180623b8c4f68499b9ab2e