From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 19 Sep 2008 11:17:10 +0000 (+0000)
Subject: merge of '02c1db88e98d999e6fbb3fda096727c1fc8ad6aa'
X-Git-Tag: Release-2010-05/1~6051^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a86433f74983c1e91b1436997551e9fb9923f98;p=openembedded.git

Merge ... '02c1db88e98d999e6fbb3fda096727c1fc8ad6aa'
     and '3a233f347017316b01a5399291d49424a3a4ba9f'
---

6a86433f74983c1e91b1436997551e9fb9923f98