From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 8 Aug 2007 10:48:54 +0000 (+0000)
Subject: merge of '4cdf2bbe0fc7b789810df60b02beff2b35c94877'
X-Git-Tag: Release-2010-05/1~9076^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e63bfd7754b8366b19d4182aa24af4798fcc60a;p=openembedded.git

Merge ... '4cdf2bbe0fc7b789810df60b02beff2b35c94877'
     and 'bacc3c96b6e486deae2dc054f9eafdfa75b6e618'
---

4e63bfd7754b8366b19d4182aa24af4798fcc60a