From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 25 Aug 2008 22:23:24 +0000 (+0000)
Subject: merge of '24a01b709a1340721c80ac90b928ab9d4e1ea0be'
X-Git-Tag: Release-2010-05/1~6243
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=873413a3c34c92913c9829a85e800f0ff083d443;p=openembedded.git

Merge ... '24a01b709a1340721c80ac90b928ab9d4e1ea0be'
     and '60842b466603b662ce4ff57d65e2d0ff713c018e'
---

873413a3c34c92913c9829a85e800f0ff083d443