From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Thu, 26 Apr 2007 16:54:23 +0000 (+0000)
Subject: merge of '0a4ab83c5e46677b239452867d3205ca5843586f'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~46
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f85eb47f08abf99f426e0d533b0f4f05886775c0;p=openembedded.git

Merge ... '0a4ab83c5e46677b239452867d3205ca5843586f'
     and '6a5c817d2f11720452c0b470075091121ce6ab96'
---

f85eb47f08abf99f426e0d533b0f4f05886775c0