From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 5 May 2008 15:26:18 +0000 (+0000)
Subject: merge of '1c81965a2b4441230dcc780cb75b714800217cf4'
X-Git-Tag: Release-2010-05/1~7019^2~3^2^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93efeb8f87b3d2e25f358919557367e9763c515f;p=openembedded.git

Merge ... '1c81965a2b4441230dcc780cb75b714800217cf4'
     and 'd61da5b80e9dd6d9c4abeb4bdba7558079f3ccdf'
---

93efeb8f87b3d2e25f358919557367e9763c515f