From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 22 Jan 2006 19:53:30 +0000 (+0000)
Subject: merge of 655180ca822fd77b58f585a3b13300acdaedb1cb
X-Git-Tag: Release-2010-05/1~9453^2~2583
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9db5d004ab478d2dfde46a021b1c3d2cc3bd38c8;p=openembedded.git

merge of 655180ca822fd77b58f585a3b13300acdaedb1cb
     and b6b0df140fe53ce37d902d8cc41a838a4abc1b7b
---

9db5d004ab478d2dfde46a021b1c3d2cc3bd38c8