From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 23 Jul 2005 20:00:48 +0000 (+0000)
Subject: merge of 470f2685dfe5cb3786786067c1edf1282dd1c536
X-Git-Tag: Release-2010-05/1~9453^2~4081
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc0159d05f362b458f2d995b522e5cccde4952f1;p=openembedded.git

merge of 470f2685dfe5cb3786786067c1edf1282dd1c536
     and 50481fac31a3c89de7959f87001b670c05ea5e7a
---

fc0159d05f362b458f2d995b522e5cccde4952f1