From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 9 Sep 2007 11:41:44 +0000 (+0000)
Subject: merge of '3025e5e7a53ca716304775ca0ca1dc45ca4b0524'
X-Git-Tag: Release-2010-05/1~8701^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4ef6eacfb2280a4d63cd569d691280fdf6b0e8f;p=openembedded.git

Merge ... '3025e5e7a53ca716304775ca0ca1dc45ca4b0524'
     and '60271e29029910207b8512833d049fad50fb282b'
---

e4ef6eacfb2280a4d63cd569d691280fdf6b0e8f