From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 3 Oct 2008 11:06:17 +0000 (+0000)
Subject: merge of '33fdbdf4099643f0cfc674de6234840544695efc'
X-Git-Tag: Release-2010-05/1~5850^2~22^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc4882b8491bdb051f2c8ebf06109af206b33cb8;p=openembedded.git

Merge ... '33fdbdf4099643f0cfc674de6234840544695efc'
     and '8cbbaefc242a3db691387a4cdb4aca694ee0215f'
---

cc4882b8491bdb051f2c8ebf06109af206b33cb8