From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 18 May 2006 16:43:11 +0000 (+0000)
Subject: merge of 0e0330b1ab6021531dd2672734314cafd639c05a
X-Git-Tag: Release-2010-05/1~9453^2~1681
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=130a3f841d9a0324e10f4bd7e87539b44ea05c7c;p=openembedded.git

merge of 0e0330b1ab6021531dd2672734314cafd639c05a
     and 1cc5c1036de76301e8e3356118ad46f2a94a8fb2
---

130a3f841d9a0324e10f4bd7e87539b44ea05c7c