From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 20 Oct 2006 12:52:26 +0000 (+0000)
Subject: merge of 'af022eaccf1ea1052c096be4c37accec350e9b27'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c9f18e5c7df1f7bd52ebbe6bd7a308ec679495f;p=openembedded.git

Merge ... 'af022eaccf1ea1052c096be4c37accec350e9b27'
     and 'ec665a2227c0b81f567aec855a2e84ae2eb437a8'
---

7c9f18e5c7df1f7bd52ebbe6bd7a308ec679495f