From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 21 Aug 2005 23:27:23 +0000 (+0000)
Subject: merge of 1a161e3d9f46581507d1542d1112d40c07481893
X-Git-Tag: Release-2010-05/1~9453^2~3849^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a98fc361734009b592044b9b73dfdce3f20caebd;p=openembedded.git

merge of 1a161e3d9f46581507d1542d1112d40c07481893
     and 80954f6b3dd012af79d0b0eecc7015cd1b46aa27
---

a98fc361734009b592044b9b73dfdce3f20caebd