From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Feb 2008 16:17:07 +0000 (+0000)
Subject: merge of '96cde176098aad6ac5bbe96aa5d939a61de53f6d'
X-Git-Tag: Release-2010-05/1~7664
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e60a4a4b6993cdea4c11503b630c9db84b2a13ca;p=openembedded.git

Merge ... '96cde176098aad6ac5bbe96aa5d939a61de53f6d'
     and 'c8560517964ebe70f94d18575236bb3b49f087b8'
---

e60a4a4b6993cdea4c11503b630c9db84b2a13ca