From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 16 Jul 2008 07:52:48 +0000 (+0000)
Subject: merge of '641a15c42908d49a2d22b32302275bdcee06d601'
X-Git-Tag: Release-2010-05/1~6543^2~7^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f4e03158ddc147fe194b47f0f0da10076cdab48;p=openembedded.git

Merge ... '641a15c42908d49a2d22b32302275bdcee06d601'
     and 'bcdca45c1b2872acd0f00daa6d38395d0d5867d1'
---

0f4e03158ddc147fe194b47f0f0da10076cdab48