From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 23 Mar 2008 17:22:11 +0000 (+0000)
Subject: merge of '0d93ec84b30bc1bee2caaee72d667f87bc468a70'
X-Git-Tag: Release-2010-05/1~7294
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e93f32d920cb71827087952eea4ea2fb61eb7263;p=openembedded.git

Merge ... '0d93ec84b30bc1bee2caaee72d667f87bc468a70'
     and '4d3f6129ff74b55c246c109b0515837fb4fcef27'
---

e93f32d920cb71827087952eea4ea2fb61eb7263