From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 21 Jan 2007 23:03:22 +0000 (+0000)
Subject: merge of 54d4c3d2efb39c8c1b9e97c60b643eb6791d12a4
X-Git-Tag: Release-2010-05/1~9352^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e339a08e7d90c4829674dfb6f0ef60d45ab77853;p=openembedded.git

merge of 54d4c3d2efb39c8c1b9e97c60b643eb6791d12a4
     and d41ab66a53746790b53abecf4b629956ff6a4d25
---

e339a08e7d90c4829674dfb6f0ef60d45ab77853