From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 20 May 2008 14:29:42 +0000 (+0000)
Subject: merge of '854af845cc8e7d6a3ae568387115eb89f78fba82'
X-Git-Tag: Release-2010-05/1~6882^2~12^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6f54174f6b7fa826719cf013e0bfcdbd0e67373;p=openembedded.git

Merge ... '854af845cc8e7d6a3ae568387115eb89f78fba82'
     and 'b580e935f43d469d6a35f9c89515741825cb9375'
---

a6f54174f6b7fa826719cf013e0bfcdbd0e67373