From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 16 Jul 2005 22:41:40 +0000 (+0000)
Subject: merge of 4945900d6b970a0180dcbf40306e9caa5fd900ff
X-Git-Tag: Release-2010-05/1~9453^2~4153
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6b4d74d882bdbc2b9e0ca8447a1a7bd7de23173;p=openembedded.git

merge of 4945900d6b970a0180dcbf40306e9caa5fd900ff
     and baadb7d4c420b583d88b6fc26b79d5a50fe5a888
---

d6b4d74d882bdbc2b9e0ca8447a1a7bd7de23173