From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 11 Aug 2006 20:38:22 +0000 (+0000)
Subject: merge of 296e66426511a2f435ec31779df775a4464ac37a
X-Git-Tag: Release-2010-05/1~9453^2~972
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e8afed4ae391f3ff38cb05f4258a4f689b0d584;p=openembedded.git

merge of 296e66426511a2f435ec31779df775a4464ac37a
     and 4272cf6c19f128a083eb5c5886cdcc75a1b0818c
---

8e8afed4ae391f3ff38cb05f4258a4f689b0d584