From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 6 Feb 2006 18:41:09 +0000 (+0000)
Subject: merge of 0b31d87c1b9bcc0d2789be6377713fc1adcc891a
X-Git-Tag: Release-2010-05/1~9453^2~2424
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27651b95cc9880d646b60e62686bbd1b000556ba;p=openembedded.git

merge of 0b31d87c1b9bcc0d2789be6377713fc1adcc891a
     and 939b3d278f2da67c4ed00b67eabd89eb6d0c0f59
---

27651b95cc9880d646b60e62686bbd1b000556ba