From: Matthias Hentges <oe@hentges.net>
Date: Mon, 2 Jul 2007 02:14:25 +0000 (+0000)
Subject: merge of '31bba0038265d49f89a999578ff89351b559e4a0'
X-Git-Tag: Release-2010-05/1~8868^2~264
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89f3cddad432c169486c0be76588b4e1c9842e8c;p=openembedded.git

Merge ... '31bba0038265d49f89a999578ff89351b559e4a0'
     and 'a6fcc49ed2f48cc2516058b4deccdca676b66dd6'
---

89f3cddad432c169486c0be76588b4e1c9842e8c