From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 17 Apr 2006 13:44:06 +0000 (+0000)
Subject: merge of 0b09834f6c4f44d4145ed8d06e17ecf1d1c48029
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=548f2cd5ba570b5bb22d02c2ff0cf51abbd850e5;p=openembedded.git

merge of 0b09834f6c4f44d4145ed8d06e17ecf1d1c48029
     and e96a56e5b78296091533ce1d0a3856405435e1ec
---

548f2cd5ba570b5bb22d02c2ff0cf51abbd850e5