From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 4 Sep 2008 11:12:29 +0000 (+0000)
Subject: merge of 'b9249f27ed481c5d02d4b0a68b50c1e6688fe484'
X-Git-Tag: Release-2010-05/1~6161
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7151970dde7e1a95c7d829f2b7792e038ef83398;p=openembedded.git

Merge ... 'b9249f27ed481c5d02d4b0a68b50c1e6688fe484'
     and 'c8025b1589420ff484c99ad1c0e06906ad36b85d'
---

7151970dde7e1a95c7d829f2b7792e038ef83398