From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Fri, 6 Jun 2008 14:40:04 +0000 (+0000)
Subject: merge of '8c882ebf352023c6daf9ea756d94b90aef6d21ba'
X-Git-Tag: Release-2010-05/1~6809
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b3d3202deb418a9234596c2f332788e92ee24e9;p=openembedded.git

Merge ... '8c882ebf352023c6daf9ea756d94b90aef6d21ba'
     and 'e39129641bd214aff1dd438b4331a2f1531ca1cc'
---

5b3d3202deb418a9234596c2f332788e92ee24e9