From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 14 Aug 2005 16:40:05 +0000 (+0000)
Subject: merge of 38a9824230c1f33aa1b69405d1a6074d1df99753
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~29
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef4409bc8d3c40b3ba39d2fe4c91e68785bbd419;p=openembedded.git

merge of 38a9824230c1f33aa1b69405d1a6074d1df99753
     and d83e77353ac4cf240e630aa66aa54eb794547a60
---

ef4409bc8d3c40b3ba39d2fe4c91e68785bbd419