From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Jul 2006 13:28:05 +0000 (+0000)
Subject: merge of 0fb0ebb33b635bc17b0a13f6da59e6bd1b474b79
X-Git-Tag: Release-2010-05/1~9453^2~1252
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e3363e9083cd0f2a4ee111f2bb64c23bb56598;p=openembedded.git

merge of 0fb0ebb33b635bc17b0a13f6da59e6bd1b474b79
     and a853b21c963bb2e9056ecffcbc9af65a6b73aa1f
---

a5e3363e9083cd0f2a4ee111f2bb64c23bb56598