From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 11 May 2006 16:20:30 +0000 (+0000)
Subject: merge of 868246069be482bc64e4d7bd013d7a0df35de286
X-Git-Tag: Release-2010-05/1~9453^2~1723
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a929c95a66b89e9a510fe41658144f9b6738dd6a;p=openembedded.git

merge of 868246069be482bc64e4d7bd013d7a0df35de286
     and e4d2a954ceceaa23fece37507c8e7f43cfbf1047
---

a929c95a66b89e9a510fe41658144f9b6738dd6a