From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 16 Aug 2008 16:19:55 +0000 (+0000)
Subject: merge of 'a1ae39784d60dda6b344012a273c0a4f2a339a97'
X-Git-Tag: Release-2010-05/1~6317^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97f991702952f288dfbb34fee41b56799c654e31;p=openembedded.git

Merge ... 'a1ae39784d60dda6b344012a273c0a4f2a339a97'
     and 'e5687f708388bd5700f6433bd38eecc7e0f1ebd1'
---

97f991702952f288dfbb34fee41b56799c654e31