From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 23 Jan 2008 21:47:24 +0000 (+0000)
Subject: merge of '1e9547d3fd33d249bb3cdd7e7a4670cfcbb11310'
X-Git-Tag: Release-2010-05/1~7838^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=930f0280fede11fef8914288dd6a0e5e5d87ddd8;p=openembedded.git

Merge ... '1e9547d3fd33d249bb3cdd7e7a4670cfcbb11310'
     and 'f4e5cfc232e8f1488452378938ddaa3b3fc3d4a6'
---

930f0280fede11fef8914288dd6a0e5e5d87ddd8