From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 31 May 2006 15:46:29 +0000 (+0000)
Subject: merge of 4cfdadba6908591a58400b358f66aa5d7a5c2d9e
X-Git-Tag: Release-2010-05/1~9453^2~1553
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f33c9c183de6d97848c9c0302b8717251906144;p=openembedded.git

merge of 4cfdadba6908591a58400b358f66aa5d7a5c2d9e
     and fab9c0728e8095f1a2f9da508f583854558542f7
---

4f33c9c183de6d97848c9c0302b8717251906144