From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Jul 2006 12:53:16 +0000 (+0000)
Subject: merge of 4ae75badc5589c35fd33c90369b77e8d0a4d0c46
X-Git-Tag: Release-2010-05/1~9453^2~1360
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=685cf31f2462873bb67a7d0c7c6d96bbd36529f5;p=openembedded.git

merge of 4ae75badc5589c35fd33c90369b77e8d0a4d0c46
     and b2d6befb14a575e840b80779b3ee9e578a4bb3ce
---

685cf31f2462873bb67a7d0c7c6d96bbd36529f5