From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 23 Aug 2007 13:44:55 +0000 (+0000)
Subject: merge of '555ca250058a761fb7d692d41e9748b7168b2e6d'
X-Git-Tag: Release-2010-05/1~8811^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4a9ed8eb9a9db4933b2592fa51611b0e742bae0;p=openembedded.git

Merge ... '555ca250058a761fb7d692d41e9748b7168b2e6d'
     and '57097c5f7112c41b7466c7f14c1b99593a6d65ae'
---

a4a9ed8eb9a9db4933b2592fa51611b0e742bae0