From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 20 Jul 2005 21:48:43 +0000 (+0000)
Subject: merge of 60b47beac72c6f1f23514b42a309716b470d471b
X-Git-Tag: Release-2010-05/1~9453^2~4110
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=143f2c0ec97bacab5fefa9a5790bbad7373db9e7;p=openembedded.git

merge of 60b47beac72c6f1f23514b42a309716b470d471b
     and 7fbbef1848aa08b7ef6e7a00db436c1db5c2002e
---

143f2c0ec97bacab5fefa9a5790bbad7373db9e7