From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Sep 2007 00:49:28 +0000 (+0000)
Subject: merge of '235d3c4d9fbc3aee4e352851f04eb4fa2da4a68f'
X-Git-Tag: Release-2010-05/1~8658^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d406da3ff0b55d944afd9521c7e26ad614ff3ac;p=openembedded.git

Merge ... '235d3c4d9fbc3aee4e352851f04eb4fa2da4a68f'
     and '2d2fba06a82095954bfbae27ea7e7024c3604521'
---

3d406da3ff0b55d944afd9521c7e26ad614ff3ac