From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 11 Jul 2005 21:00:21 +0000 (+0000)
Subject: merge of 0aa8013267614c94b0122ab5b95c006413d93be2
X-Git-Tag: Release-2010-05/1~9453^2~4192
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=659282a06d74bef7b0d9cb5e11bca2e10361cdb6;p=openembedded.git

merge of 0aa8013267614c94b0122ab5b95c006413d93be2
     and 24a509421f0088ff76c3cdd4736508a7c4b02a86
---

659282a06d74bef7b0d9cb5e11bca2e10361cdb6