From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 11 Jan 2007 22:47:42 +0000 (+0000)
Subject: merge of '626cf4325c0654b9580525c44fc4b4a1eef602f2'
X-Git-Tag: Release-2010-05/1~9366^2~13^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd383b749127797cc7cf9ba556c685e1c70e32ea;p=openembedded.git

Merge ... '626cf4325c0654b9580525c44fc4b4a1eef602f2'
     and '864030c30acdb89f49bcfbd4707a4a16dcfb2b53'
---

cd383b749127797cc7cf9ba556c685e1c70e32ea