From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 22 Jun 2007 04:11:30 +0000 (+0000)
Subject: merge of '43f0162e257c27b3b68e689fc1e52fc7d296db3d'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc10c989c666c95bb7ea41bc24bd14c396625286;p=openembedded.git

Merge ... '43f0162e257c27b3b68e689fc1e52fc7d296db3d'
     and 'b1be59f70fc52177a67b15d29fc93897c548b5a8'
---

fc10c989c666c95bb7ea41bc24bd14c396625286