From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 30 Aug 2006 14:15:16 +0000 (+0000)
Subject: merge of 2e20cd2e17b7f73e026db0536fb11075bff0eaf9
X-Git-Tag: Release-2010-05/1~9453^2~875^2~138
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37e50fee3b8a39bda1252ee27ba3ca2c186da51d;p=openembedded.git

merge of 2e20cd2e17b7f73e026db0536fb11075bff0eaf9
     and 9a707a5097109b9a1f2ce8a8f2945ef2d611a1d6
---

37e50fee3b8a39bda1252ee27ba3ca2c186da51d