From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 16 Oct 2006 13:32:42 +0000 (+0000)
Subject: merge of '12ff563eb00759b6cae9ecfc5c1400f246dcd533'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~158
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=929850f6a2ddba9f7e7c10ddd88b34be8e6b7d3d;p=openembedded.git

Merge ... '12ff563eb00759b6cae9ecfc5c1400f246dcd533'
     and '3763af0dd8f9b6f2ec526ab6fcef3a00efd7576e'
---

929850f6a2ddba9f7e7c10ddd88b34be8e6b7d3d