From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 9 May 2006 14:21:10 +0000 (+0000)
Subject: merge of 183a7abb14b61cce40ef9860783b1523f0caa0cd
X-Git-Tag: Release-2010-05/1~9453^2~1737
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2452e96ebf0d1a5c9fae35ad56383d6fac3ef031;p=openembedded.git

merge of 183a7abb14b61cce40ef9860783b1523f0caa0cd
     and 579c05403bf5a71c89a55a696898f027db224a5e
---

2452e96ebf0d1a5c9fae35ad56383d6fac3ef031