From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 24 Jul 2005 21:42:10 +0000 (+0000)
Subject: merge of f32d65a137da0098ee47bdab991b7ac17c15f0a4
X-Git-Tag: Release-2010-05/1~9453^2~4062
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ec58c1b68854eb64820f1e62fa8e68afaf48833;p=openembedded.git

merge of f32d65a137da0098ee47bdab991b7ac17c15f0a4
     and fca1070eaa90db3b30a008267883aa0c7b5425dd
---

6ec58c1b68854eb64820f1e62fa8e68afaf48833