From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 27 Jul 2008 10:32:12 +0000 (+0000)
Subject: merge of '2700039073a3760641797b52ac5897f2eee3d92a'
X-Git-Tag: Release-2010-05/1~6454^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccf82499ebfe39b56600044ec78273fd13ba23b0;p=openembedded.git

Merge ... '2700039073a3760641797b52ac5897f2eee3d92a'
     and 'ddb3262e0fe9acfe7d20567e33ef27bcfe0d0801'
---

ccf82499ebfe39b56600044ec78273fd13ba23b0