From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 26 Aug 2008 15:35:52 +0000 (+0000)
Subject: merge of '8f5711b8ee04e00c48f5997987d6ab4600e5dc19'
X-Git-Tag: Release-2010-05/1~6240
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de9009f8e9bfdad0343494ba99e3ae4e830fb871;p=openembedded.git

Merge ... '8f5711b8ee04e00c48f5997987d6ab4600e5dc19'
     and 'b04f946bcf310267d7557532bc06f235d79f8226'
---

de9009f8e9bfdad0343494ba99e3ae4e830fb871