From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 16 Aug 2007 13:44:42 +0000 (+0000)
Subject: merge of '2a44f6283ca97f8f5d3a7e5075008a46aaf531fb'
X-Git-Tag: Release-2010-05/1~8920^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dec57b109f4fe419b538cdb23dda8368d5ac92d;p=openembedded.git

Merge ... '2a44f6283ca97f8f5d3a7e5075008a46aaf531fb'
     and '52d9ae7d2594e31289d20d8dbe1bb58be3c26a82'
---

8dec57b109f4fe419b538cdb23dda8368d5ac92d