From: Thomas Kunze <thommycheck@gmx.de>
Date: Tue, 15 Apr 2008 11:00:44 +0000 (+0000)
Subject: merge of 'acd40ed8d57971494f1b3dea27c1e5c3ab6b2a7f'
X-Git-Tag: Release-2010-05/1~7194^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22586092474a75f63337026fcfaa25701ad5b872;p=openembedded.git

Merge ... 'acd40ed8d57971494f1b3dea27c1e5c3ab6b2a7f'
     and 'ff7245ddafaf0bcb4c4a73dea132994953a8ff8c'
---

22586092474a75f63337026fcfaa25701ad5b872