From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 21 Oct 2006 11:03:50 +0000 (+0000)
Subject: merge of 70b8885f91280693d7cbd223c133cdad1d106ca6
X-Git-Tag: Release-2010-05/1~9453^2~567^2~56^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cb6683b10dcf0508e8982a497b10630d62af38e;p=openembedded.git

merge of 70b8885f91280693d7cbd223c133cdad1d106ca6
     and 4b0133764e1b19133abfc5dd0dccaadce5f5593a
---

9cb6683b10dcf0508e8982a497b10630d62af38e