From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Mar 2008 19:07:55 +0000 (+0000)
Subject: merge of '21a4d6e9a83528919c5fa1100510fac988f3fb20'
X-Git-Tag: Release-2010-05/1~7588
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b24c6eaabe13f8d3b27b5f4991ccf80cb78e97f;p=openembedded.git

Merge ... '21a4d6e9a83528919c5fa1100510fac988f3fb20'
     and '36ae94ae884a55393124760a3d8811541c62e82d'
---

8b24c6eaabe13f8d3b27b5f4991ccf80cb78e97f