From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Apr 2006 12:32:45 +0000 (+0000)
Subject: merge of b9308de4d2d1072e26d134bd4eada0efa17993f6
X-Git-Tag: Release-2010-05/1~9453^2~2071
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d25409164d0ce017b9703c9c1e60a0587f4f5f2f;p=openembedded.git

merge of b9308de4d2d1072e26d134bd4eada0efa17993f6
     and efd8840244d74e5cab246e93e24993c96eeb9db8
---

d25409164d0ce017b9703c9c1e60a0587f4f5f2f