From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 10 May 2006 20:43:56 +0000 (+0000)
Subject: merge of 460c9c22eddb03009d980c3edb1ee42689b9e09d
X-Git-Tag: Release-2010-05/1~9453^2~1730^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e5fb52e1267b68327c395b5cada0181ac356450;p=openembedded.git

merge of 460c9c22eddb03009d980c3edb1ee42689b9e09d
     and a349b2053c350eb4d9799057043eefd3946fad4c
---

3e5fb52e1267b68327c395b5cada0181ac356450