From: Matthias Hentges <oe@hentges.net>
Date: Fri, 26 May 2006 09:25:34 +0000 (+0000)
Subject: merge of 0aa8df480a5fe2c0daeaff3c39171cce7fde6a4a
X-Git-Tag: Release-2010-05/1~9453^2~1617^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ab658bccabfdb1792e966c6725fc2496ffbb3f9;p=openembedded.git

merge of 0aa8df480a5fe2c0daeaff3c39171cce7fde6a4a
     and cbe9e2ec3566ef5af4fa806a0faec1ddf3984cd4
---

1ab658bccabfdb1792e966c6725fc2496ffbb3f9