From: Martin Dietze <di@fh-wedel.de>
Date: Thu, 2 Nov 2006 14:01:03 +0000 (+0000)
Subject: merge of '52a6d55e272aa56689f2387c7c4321d72814b233'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~40^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f1cfc01d83b565bcb1b443f0a0a3727f8ef1666;p=openembedded.git

Merge ... '52a6d55e272aa56689f2387c7c4321d72814b233'
     and 'f7f6b0cbdf5cd009306c5467075a9f19734a4da3'
---

7f1cfc01d83b565bcb1b443f0a0a3727f8ef1666