From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 21 Jun 2006 10:52:29 +0000 (+0000)
Subject: merge of 02169d766c8620f531bb081faa58a6d1c2277f1e
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~14^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=024cc3f57b51c3919ed7b543d6d86e46bb3735ca;p=openembedded.git

merge of 02169d766c8620f531bb081faa58a6d1c2277f1e
     and 0638b16efb00651727ae22ae7f39bc1e65dc46de
---

024cc3f57b51c3919ed7b543d6d86e46bb3735ca