From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Fri, 25 Jul 2008 15:47:54 +0000 (+0000)
Subject: merge of '0032a5aa8024f5f2c529e386ce8e631cbe32131e'
X-Git-Tag: Release-2010-05/1~6469^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fccb80c4acb8827091550870271980add675765b;p=openembedded.git

Merge ... '0032a5aa8024f5f2c529e386ce8e631cbe32131e'
     and '0948ccadfd54691007037bfcc956a41728ab914d'
---

fccb80c4acb8827091550870271980add675765b