From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 12 May 2006 20:22:26 +0000 (+0000)
Subject: merge of 42b8c7920b08e37a6ea01ca90bfdc0e0aa4c2759
X-Git-Tag: Release-2010-05/1~9453^2~1709^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc04bb66fdd9d88b6d4f461211fdc96799a6c903;p=openembedded.git

merge of 42b8c7920b08e37a6ea01ca90bfdc0e0aa4c2759
     and b4da6e3e315557823da6a4486c8fb7ab3d82ab8a
---

fc04bb66fdd9d88b6d4f461211fdc96799a6c903