From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 8 Jul 2007 18:53:15 +0000 (+0000)
Subject: merge of '3b04f9d33d900f95c8814c78ad7693a4bd404ded'
X-Git-Tag: Release-2010-05/1~8868^2~189
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e35b03a3bad4a30461aad4fecb16a1a7a9c67d8a;p=openembedded.git

Merge ... '3b04f9d33d900f95c8814c78ad7693a4bd404ded'
     and 'f6a57e1a7e63e62b04f74e02986c4cc6c30ece2a'
---

e35b03a3bad4a30461aad4fecb16a1a7a9c67d8a