From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 4 Aug 2007 20:47:30 +0000 (+0000)
Subject: merge of '15632785e576f4fbbf9cdccf18d8aae806bec193'
X-Git-Tag: Release-2010-05/1~8868^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40f235ee23e7ed72a7e28c16dbcb2a1d2d02a6d3;p=openembedded.git

Merge ... '15632785e576f4fbbf9cdccf18d8aae806bec193'
     and 'dace6576f510b1f3af99d9580e3f0d3d18a773b1'
---

40f235ee23e7ed72a7e28c16dbcb2a1d2d02a6d3