From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 14 May 2006 20:29:04 +0000 (+0000)
Subject: merge of 551b99b264a271c5af4896cd57b97354be2f16ab
X-Git-Tag: Release-2010-05/1~9453^2~1699
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eeff07e8d6a2ca2d1dac8a4f21a1b6ae48c5121;p=openembedded.git

merge of 551b99b264a271c5af4896cd57b97354be2f16ab
     and 5ae554cda8a73547164d9102e1fb7f3a9f9fe6ec
---

3eeff07e8d6a2ca2d1dac8a4f21a1b6ae48c5121