From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 May 2006 19:17:24 +0000 (+0000)
Subject: merge of 30eebf6ff01f422b7202f44394c4cd74a659e235
X-Git-Tag: Release-2010-05/1~9453^2~1708
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94bb836c42bb122b140d7fc0ad0a5775a064ce9a;p=openembedded.git

merge of 30eebf6ff01f422b7202f44394c4cd74a659e235
     and aaa38d713385c71e081266891f9d3775789db3a1
---

94bb836c42bb122b140d7fc0ad0a5775a064ce9a