From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 28 Aug 2007 01:25:15 +0000 (+0000)
Subject: merge of '7c5d468e4126d275fd4f17ccdc3a160b3e0b09a5'
X-Git-Tag: Release-2010-05/1~8789^2~16^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=446ce329e2b6d14f48efe4dcf3cd78234bc2e0fc;p=openembedded.git

Merge ... '7c5d468e4126d275fd4f17ccdc3a160b3e0b09a5'
     and '9e3f287c579cb592207f2e225ab8735174982867'
---

446ce329e2b6d14f48efe4dcf3cd78234bc2e0fc