From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 16 Jun 2008 11:43:36 +0000 (+0000)
Subject: merge of '6d659ab83a5262d1e21010e8ef7628a905dfff84'
X-Git-Tag: Release-2010-05/1~6679
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a42b26fd478a07ea163770e4f3238fe40cbe97a3;p=openembedded.git

Merge ... '6d659ab83a5262d1e21010e8ef7628a905dfff84'
     and '9923a1dbe2ed8c727cb2a236afa5262aaa83fb19'
---

a42b26fd478a07ea163770e4f3238fe40cbe97a3