From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 2 Jul 2006 20:37:42 +0000 (+0000)
Subject: merge of d0c5b7c949900a094e2ea11d85707b56997e2c91
X-Git-Tag: Release-2010-05/1~9453^2~1375
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44243e69a77338097b295c1eccb58adcb8a91038;p=openembedded.git

merge of d0c5b7c949900a094e2ea11d85707b56997e2c91
     and e4222200ae643006a3cbf7b68e35883321c05949
---

44243e69a77338097b295c1eccb58adcb8a91038