From: Matthias Hentges <oe@hentges.net>
Date: Mon, 3 Jul 2006 15:16:55 +0000 (+0000)
Subject: merge of 5f35d986fdda87fb19898bc6150d8325c737273f
X-Git-Tag: Release-2010-05/1~9453^2~1355^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b674fde0f4b05e2e3d5c6062e8ebd7e462f6800;p=openembedded.git

merge of 5f35d986fdda87fb19898bc6150d8325c737273f
     and e97331a2b823abbbc0aa40e32d3ce1f542575042
---

7b674fde0f4b05e2e3d5c6062e8ebd7e462f6800