From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 8 Mar 2008 17:59:41 +0000 (+0000)
Subject: merge of '1d903fb7ec58f7624d299d4ab97b686792281fab'
X-Git-Tag: Release-2010-05/1~7516^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c0dcff4a17535f38fe103ddd02584362a7ca6cd;p=openembedded.git

Merge ... '1d903fb7ec58f7624d299d4ab97b686792281fab'
     and 'e32ef2d91c28ac53b3bb5ea6cc70a9ed3182abb5'
---

7c0dcff4a17535f38fe103ddd02584362a7ca6cd