From: Matthias Hentges <oe@hentges.net>
Date: Sat, 30 Jun 2007 18:21:24 +0000 (+0000)
Subject: merge of '46bdfedbe1ecde1685daaddc2f0b8a46939f17c4'
X-Git-Tag: Release-2010-05/1~8868^2~268
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=350e6d7ed17fa91e1ddb42ee77ef7175f513a7df;p=openembedded.git

Merge ... '46bdfedbe1ecde1685daaddc2f0b8a46939f17c4'
     and 'fd22e92470cbc7bd32d4c2d747a6577afd80516e'
---

350e6d7ed17fa91e1ddb42ee77ef7175f513a7df