From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 7 Sep 2005 14:26:25 +0000 (+0000)
Subject: merge of 301eec9b699901af861fb29a8cebbe1e1b608b1f
X-Git-Tag: Release-2010-05/1~9453^2~3608
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4d1e2b034e26206bf1929a7b2cda1a1a5c4187e;p=openembedded.git

merge of 301eec9b699901af861fb29a8cebbe1e1b608b1f
     and 692e8d4a1e59eedb7b14074d84e2c5438e48808d
---

a4d1e2b034e26206bf1929a7b2cda1a1a5c4187e