From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 7 Aug 2007 13:40:39 +0000 (+0000)
Subject: merge of '03be9e5a3850ab5de1d4fc22dae2a3d06eabcb39'
X-Git-Tag: Release-2010-05/1~9076^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d5d173a2d4df73e4ee68a3013498bbccde51bdc;p=openembedded.git

Merge ... '03be9e5a3850ab5de1d4fc22dae2a3d06eabcb39'
     and 'b8fa0cf27dc1754245e1f078f2c5d7ef0365ea2e'
---

9d5d173a2d4df73e4ee68a3013498bbccde51bdc