From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 21 Jul 2005 14:21:42 +0000 (+0000)
Subject: merge of 6d3ab1c248e51c9e183169b8ec8cd0fee592080c
X-Git-Tag: Release-2010-05/1~9453^2~4096^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17ab5f4762a3d2ecbcc7d086be47a10b7c9de7dd;p=openembedded.git

merge of 6d3ab1c248e51c9e183169b8ec8cd0fee592080c
     and e0bd53b164a199028ffef45edeab4802fb20522b
---

17ab5f4762a3d2ecbcc7d086be47a10b7c9de7dd