From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 15 May 2008 21:22:00 +0000 (+0000)
Subject: merge of '175617edcda6a7db0736cb199971e613308f4f28'
X-Git-Tag: Release-2010-05/1~6936
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51755d3df0e8ca4458fa788229bf84a02d12bf7a;p=openembedded.git

Merge ... '175617edcda6a7db0736cb199971e613308f4f28'
     and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'
---

51755d3df0e8ca4458fa788229bf84a02d12bf7a