From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 28 Jul 2006 11:15:21 +0000 (+0000)
Subject: merge of 59ba4be70367579301ec86a4ace2a74be281b35d
X-Git-Tag: Release-2010-05/1~9453^2~1070^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96127b82a4c45b1328d67defe4b715adcdf4e760;p=openembedded.git

merge of 59ba4be70367579301ec86a4ace2a74be281b35d
     and d685f58742a33aa75bb8b913d7c9adeb338387d1
---

96127b82a4c45b1328d67defe4b715adcdf4e760