From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 3 Jun 2008 11:38:35 +0000 (+0000)
Subject: merge of '74c5551c349d27c6ccb72cf2965707c633eb3cb9'
X-Git-Tag: Release-2010-05/1~6842^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5faf7780f65fa6df1d964606437585e79a1cb1d6;p=openembedded.git

Merge ... '74c5551c349d27c6ccb72cf2965707c633eb3cb9'
     and 'f275c97e2c93f0e846205b213e997b28ed0b148e'
---

5faf7780f65fa6df1d964606437585e79a1cb1d6