From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 19 Jul 2008 12:08:56 +0000 (+0000)
Subject: merge of 'bb80418f92c2db8734eda06db4ea527fdc5c84b0'
X-Git-Tag: Release-2010-05/1~6533
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=209683be7cf9b41732cee885d046ea97a7978eb2;p=openembedded.git

Merge ... 'bb80418f92c2db8734eda06db4ea527fdc5c84b0'
     and 'f9f4aeef69ea9d929a612c025e1e90a2de52faca'
---

209683be7cf9b41732cee885d046ea97a7978eb2