From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 17 Jun 2007 04:01:15 +0000 (+0000)
Subject: merge of '33019e0e6235ec885c91256837a062fa55cae440'
X-Git-Tag: Release-2010-05/1~8868^2~362
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a37d6de53c738d7875a6346f1d71a2d9a524deef;p=openembedded.git

Merge ... '33019e0e6235ec885c91256837a062fa55cae440'
     and 'a61aba8a057f0b182431d754bb7d4798c75ebd37'
---

a37d6de53c738d7875a6346f1d71a2d9a524deef