From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 26 Jul 2008 16:45:03 +0000 (+0000)
Subject: merge of 'adeeabec80174cc28a509847c43a6193d386e011'
X-Git-Tag: Release-2010-05/1~6467
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cff782b984312bb9d3226d9e44cb2b9a9401a81;p=openembedded.git

Merge ... 'adeeabec80174cc28a509847c43a6193d386e011'
     and 'cc5c410b6ecfd58ea2193cb45b120049db7eef5d'
---

7cff782b984312bb9d3226d9e44cb2b9a9401a81