From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 9 Mar 2008 13:53:05 +0000 (+0000)
Subject: merge of '3e42312311412182ba8645d4302c9621a58bc2a6'
X-Git-Tag: Release-2010-05/1~7517
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d811306b54b4437df0b60983ab96970ae662ff3;p=openembedded.git

Merge ... '3e42312311412182ba8645d4302c9621a58bc2a6'
     and 'a24d351d91e6596efe9b833b0d983a12bdb3b0ec'
---

6d811306b54b4437df0b60983ab96970ae662ff3