From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 18 Dec 2006 17:16:54 +0000 (+0000)
Subject: merge of '8b3f99cac7b433e63ebc902c06ae99fbf39205c7'
X-Git-Tag: Release-2010-05/1~9453^2~125^2~24^2~14^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=995a5f2d2401fdd4d7e4f7cf4517bda86a1a3e2d;p=openembedded.git

Merge ... '8b3f99cac7b433e63ebc902c06ae99fbf39205c7'
     and '9d4c63819084cf385a16232369e7d698fcb6dd87'
---

995a5f2d2401fdd4d7e4f7cf4517bda86a1a3e2d