From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 2 Dec 2007 16:05:32 +0000 (+0000)
Subject: merge of 'cdaf3702bfeaebdf9d1466a398935ab179583c9a'
X-Git-Tag: Release-2010-05/1~8239
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=282088f1ad999b8427ad8acf43021538388afa60;p=openembedded.git

Merge ... 'cdaf3702bfeaebdf9d1466a398935ab179583c9a'
     and 'd045039e1aba07c5bb52c9acf9236d6bb0cf1831'
---

282088f1ad999b8427ad8acf43021538388afa60