From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 18 Jun 2006 17:04:56 +0000 (+0000)
Subject: merge of 7312b6306cd878588176ce2cc0a31e4d0edc4e5a
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa20353c4019c5decb223dc24048f1cd9ae6893;p=openembedded.git

merge of 7312b6306cd878588176ce2cc0a31e4d0edc4e5a
     and ba21f1faf99a465ffb1326139936cb5b957c10b3
---

eaa20353c4019c5decb223dc24048f1cd9ae6893