From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 18 Jan 2008 00:51:26 +0000 (+0000)
Subject: merge of '324c9ae28ad0981fb0295081bc51f62d2b0333ab'
X-Git-Tag: Release-2010-05/1~7890^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2906680781aaebafa1a72afa8be1d941bea847a;p=openembedded.git

Merge ... '324c9ae28ad0981fb0295081bc51f62d2b0333ab'
     and '6fdc0cb19db57ac2a4d88dec24b554f7b34c593d'
---

c2906680781aaebafa1a72afa8be1d941bea847a