From: Matthias Hentges <oe@hentges.net>
Date: Sat, 30 Jun 2007 17:56:15 +0000 (+0000)
Subject: merge of '0e37e6d3147e19d5d8fd54b3596f8b3527e4be92'
X-Git-Tag: Release-2010-05/1~8868^2~268^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee47c478e20cb18c389ae5b5eca09c103e1f051a;p=openembedded.git

Merge ... '0e37e6d3147e19d5d8fd54b3596f8b3527e4be92'
     and '98d02c14c4d2e08f3fe03f716c9fa5b128b351a4'
---

ee47c478e20cb18c389ae5b5eca09c103e1f051a