From: Holger Freyther <zecke@selfish.org>
Date: Sun, 6 Jan 2008 22:51:34 +0000 (+0000)
Subject: merge of '25c6c2c84233203b8c3f1a65223fc9904814cfe2'
X-Git-Tag: Release-2010-05/1~8002^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46fddaad9897d1143ed76e99bf7cde12809b924c;p=openembedded.git

Merge ... '25c6c2c84233203b8c3f1a65223fc9904814cfe2'
     and '478b52f76ea3d55c9536816c3480d56ebcccc96d'
---

46fddaad9897d1143ed76e99bf7cde12809b924c