From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 7 May 2006 15:32:12 +0000 (+0000)
Subject: merge of 0b9bb46b4ffce99f3d0837a600f782e9b6d3f7c7
X-Git-Tag: Release-2010-05/1~9453^2~1758
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a63567e43353da2c6d98dc6e73a47e9d627f5f78;p=openembedded.git

merge of 0b9bb46b4ffce99f3d0837a600f782e9b6d3f7c7
     and f6fc6c0ebee5822d2cbdcfb0fb774d61b184af56
---

a63567e43353da2c6d98dc6e73a47e9d627f5f78