From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 11 Jan 2008 19:38:53 +0000 (+0000)
Subject: merge of '63c7ad87655c2781ad8b9c81af430596f48a24a6'
X-Git-Tag: Release-2010-05/1~7965
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cfb865779e272b26c10065995a9c7bb73ae1f37;p=openembedded.git

Merge ... '63c7ad87655c2781ad8b9c81af430596f48a24a6'
     and 'bc63a4fa471a2388437163476a7cb1cf8179bb23'
---

6cfb865779e272b26c10065995a9c7bb73ae1f37