From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 9 Jun 2006 15:05:59 +0000 (+0000)
Subject: merge of 9caf4ba565c754c9654e33192b6bdcc9ca660e06
X-Git-Tag: Release-2010-05/1~9453^2~1474
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=312ea063a8003cb7c6695515cff1925fe79fa577;p=openembedded.git

merge of 9caf4ba565c754c9654e33192b6bdcc9ca660e06
     and a782d7a4293c6186f8d4d3c9c881e7e07630968b
---

312ea063a8003cb7c6695515cff1925fe79fa577