From: Matthias Hentges <oe@hentges.net>
Date: Fri, 23 Mar 2007 18:24:21 +0000 (+0000)
Subject: merge of '846bde67b99146677600ce9b3ee03f06d8c764c3'
X-Git-Tag: Release-2010-05/1~8868^2~1010
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d74d652cb96b9bec6744bf2bb985449b343a30c;p=openembedded.git

Merge ... '846bde67b99146677600ce9b3ee03f06d8c764c3'
     and 'f0ea8dcdc5d59f269582084a643d55c9333fbc66'
---

0d74d652cb96b9bec6744bf2bb985449b343a30c