From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 20 Jun 2006 22:38:20 +0000 (+0000)
Subject: merge of 2ba8efd35a14c2dca849205133efdd2ecd83c907
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74703c393c14c2e7d357942fa2739fb703a91465;p=openembedded.git

merge of 2ba8efd35a14c2dca849205133efdd2ecd83c907
     and d43467c2202cf4bba65631e9cb48b580772f7fc1
---

74703c393c14c2e7d357942fa2739fb703a91465