From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 25 Apr 2006 21:49:21 +0000 (+0000)
Subject: merge of 45a5427b6f0cf6bd9348091b9a3207186c8f7ec2
X-Git-Tag: Release-2010-05/1~9453^2~1898
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff1fd2fd17597638dcb65ff7010d26e3d9a63154;p=openembedded.git

merge of 45a5427b6f0cf6bd9348091b9a3207186c8f7ec2
     and 8ece4b6d66be2e1540ebb969513da31e4970d3a0
---

ff1fd2fd17597638dcb65ff7010d26e3d9a63154