From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 20 Apr 2006 22:56:57 +0000 (+0000)
Subject: merge of 3aa7e8c00e162c64558b2b2bf8171f7887f4725b
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~48
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d3f4dc7c8b47a2cc1a63327273507bce6602024;p=openembedded.git

merge of 3aa7e8c00e162c64558b2b2bf8171f7887f4725b
     and d35a0eeacf900a9c366ef434552e49f6cf777bb7
---

3d3f4dc7c8b47a2cc1a63327273507bce6602024