From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 5 Sep 2008 12:18:52 +0000 (+0000)
Subject: merge of '9fa037171b6c9f0d06ed8aa7dc11716dfbacebbf'
X-Git-Tag: Release-2010-05/1~6149
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84872c649ca3c08ffa3a3953a64cf26b9ef3014e;p=openembedded.git

Merge ... '9fa037171b6c9f0d06ed8aa7dc11716dfbacebbf'
     and 'db7aa3c67ff99859a56b540059d1f21cc95da4b5'
---

84872c649ca3c08ffa3a3953a64cf26b9ef3014e