From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 20 May 2006 18:31:50 +0000 (+0000)
Subject: merge of 17b5ed09da5a4cdb493874b746d2586d5ba53c86
X-Git-Tag: Release-2010-05/1~9453^2~1665^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61a3368e962e14767ccbd4f24456b362bedbfdd2;p=openembedded.git

merge of 17b5ed09da5a4cdb493874b746d2586d5ba53c86
     and 8d5e1a3025b2da6e7d30136891450c13c77eacfe
---

61a3368e962e14767ccbd4f24456b362bedbfdd2