From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 6 Aug 2005 21:37:30 +0000 (+0000)
Subject: merge of b19adf0c94378bc7f986e8f497a7aed16f2453b8
X-Git-Tag: Release-2010-05/1~9453^2~3966
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b93242895af2326a62eefe85d85b83dbe5457fd4;p=openembedded.git

merge of b19adf0c94378bc7f986e8f497a7aed16f2453b8
     and bc7105815352b23ea8f59490f29698429c7c08f1
---

b93242895af2326a62eefe85d85b83dbe5457fd4