From: Matthias Hentges <oe@hentges.net>
Date: Wed, 30 May 2007 23:16:21 +0000 (+0000)
Subject: merge of '26f36d57c301ef5fca8cc0e0ed28876c469b15c8'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~128
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=735271aaf9af081e369ee85a3ec185f53f853cda;p=openembedded.git

Merge ... '26f36d57c301ef5fca8cc0e0ed28876c469b15c8'
     and '5406c2653bff30f9af1286272f3e902e9bb919fa'
---

735271aaf9af081e369ee85a3ec185f53f853cda