From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 29 May 2006 09:17:50 +0000 (+0000)
Subject: merge of a615f71806dc9ceee0102ed403b1e7fe4f948b5d
X-Git-Tag: Release-2010-05/1~9453^2~1567^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba33bb7c0a4af155d0efe0f5b72b75254b0cb91e;p=openembedded.git

merge of a615f71806dc9ceee0102ed403b1e7fe4f948b5d
     and aac02cf2eb8931c6f1e4df467cc5ff36a36a2051
---

ba33bb7c0a4af155d0efe0f5b72b75254b0cb91e