From: Matthias Hentges <oe@hentges.net>
Date: Fri, 30 Mar 2007 22:46:54 +0000 (+0000)
Subject: merge of '302d6092c09d8a1b6e5ada2cf66d444d001796b5'
X-Git-Tag: Release-2010-05/1~8868^2~875^2~12
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25b8780a6fdda41cdd6a409e64daff512a8d00a5;p=openembedded.git

Merge ... '302d6092c09d8a1b6e5ada2cf66d444d001796b5'
     and '5075b3f69144c8ca977abda48869d41f724d1334'
---

25b8780a6fdda41cdd6a409e64daff512a8d00a5