From: Matthias Hentges <oe@hentges.net>
Date: Tue, 3 Apr 2007 22:30:38 +0000 (+0000)
Subject: merge of 'cea642eee26bd3cdd008cf21f1e1aad4ecfd69e6'
X-Git-Tag: Release-2010-05/1~8868^2~815
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4740481a0c90f191d57f60b9727782c2ec4e5315;p=openembedded.git

Merge ... 'cea642eee26bd3cdd008cf21f1e1aad4ecfd69e6'
     and 'ed8e2ec8e4ff4e211f917668a777c30d09f41c6f'
---

4740481a0c90f191d57f60b9727782c2ec4e5315