From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 29 Sep 2005 12:12:05 +0000 (+0000)
Subject: merge of 68c930a87450b83ee412109725aa2845c4653e11
X-Git-Tag: Release-2010-05/1~9453^2~3395^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15321fab4d27421977520ba783367a6ab5572207;p=openembedded.git

merge of 68c930a87450b83ee412109725aa2845c4653e11
     and 6b859f9dad018680c0cb717f227911f81f1ba1c8
---

15321fab4d27421977520ba783367a6ab5572207