From: Robert Schuster <thebohemian@gmx.net>
Date: Thu, 22 May 2008 10:50:18 +0000 (+0000)
Subject: merge of 'be23a3d9c964660487451387d6318c3915ad5b51'
X-Git-Tag: Release-2010-05/1~6882
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a2af37231403de591565a0f0618d2969a7e2cc4;p=openembedded.git

Merge ... 'be23a3d9c964660487451387d6318c3915ad5b51'
     and 'd84d3829b2f6a4c1d1cb91496cd7ffa088ed323f'
---

5a2af37231403de591565a0f0618d2969a7e2cc4