From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Jul 2006 10:20:17 +0000 (+0000)
Subject: merge of 0b32c3262ef809324fd2b1cf3daffb33589fe68c
X-Git-Tag: Release-2010-05/1~9453^2~1232
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=146ed213bfdc4c840f58f0af4c5dd25417523bf4;p=openembedded.git

merge of 0b32c3262ef809324fd2b1cf3daffb33589fe68c
     and 7bffbf2364668b2cd3e8ca978561a2cf01152db1
---

146ed213bfdc4c840f58f0af4c5dd25417523bf4