From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 12 Jun 2006 18:23:46 +0000 (+0000)
Subject: merge of fb53c03fb636482fe26316e5adacbaeb4ddd5634
X-Git-Tag: Release-2010-05/1~9453^2~1453^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=979cab34e7007b68e5da46a5e79485ac1797d10e;p=openembedded.git

merge of fb53c03fb636482fe26316e5adacbaeb4ddd5634
     and c2029c080c2c9d3dc9675ff97d1ff45df7c5fd08
---

979cab34e7007b68e5da46a5e79485ac1797d10e