From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 28 Feb 2008 12:01:56 +0000 (+0000)
Subject: merge of '5210c083ec8a6cdc5a8ab04ea377114cbb2938b3'
X-Git-Tag: Release-2010-05/1~7572^2~45^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb42c31e81c2d2a21272a0cef6dd92c0664c7cfc;p=openembedded.git

Merge ... '5210c083ec8a6cdc5a8ab04ea377114cbb2938b3'
     and 'e657326eb8ba936ca64ffbedee6d6415a1ac4ac5'
---

fb42c31e81c2d2a21272a0cef6dd92c0664c7cfc