From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 20 Aug 2007 20:55:23 +0000 (+0000)
Subject: merge of '32e6a3c5d4994942e12a0f14ff64ebd224726e17'
X-Git-Tag: Release-2010-05/1~8866
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc67c28f0b7356cda6224810d36d557dc94cbeca;p=openembedded.git

Merge ... '32e6a3c5d4994942e12a0f14ff64ebd224726e17'
     and 'f1d39ac0c47301d60716c311f9babd62a0c15fc2'
---

cc67c28f0b7356cda6224810d36d557dc94cbeca