From: Matthias Hentges <oe@hentges.net>
Date: Thu, 25 May 2006 15:59:22 +0000 (+0000)
Subject: merge of 6ba3e310353ca1a6ea62e5f5f11c116d1a1fce6d
X-Git-Tag: Release-2010-05/1~9453^2~1628
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=579d6238e817ea11c8b7b09aff2cf36c71027173;p=openembedded.git

merge of 6ba3e310353ca1a6ea62e5f5f11c116d1a1fce6d
     and f8a273706c3fce0627a1d187a0aa71db62202670
---

579d6238e817ea11c8b7b09aff2cf36c71027173