From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 25 Nov 2006 18:54:48 +0000 (+0000)
Subject: merge of 80d921d4eb948d68b2d65a3d93db120eae996016
X-Git-Tag: Release-2010-05/1~9453^2~291
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe4d9f421f55201f505268a2256f92f1efc30fd5;p=openembedded.git

merge of 80d921d4eb948d68b2d65a3d93db120eae996016
     and 8f3baeb5bf49c339b2cc784f9f4abed635cc720e
---

fe4d9f421f55201f505268a2256f92f1efc30fd5