From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 13 Jun 2006 22:35:28 +0000 (+0000)
Subject: merge of a56b1beed74d7cedad94cb2edd928cddbf3bf089
X-Git-Tag: Release-2010-05/1~9453^2~1453^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd390c132db121db8e3abc4d8d0ec95e3bdc3e6e;p=openembedded.git

merge of a56b1beed74d7cedad94cb2edd928cddbf3bf089
     and bf11bb142f46acb4b38b498495dff52f4b77083c
---

fd390c132db121db8e3abc4d8d0ec95e3bdc3e6e