From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 29 Nov 2006 17:00:14 +0000 (+0000)
Subject: merge of '574770392742c88b4d3a04f82d9c482f3b529ac7'
X-Git-Tag: Release-2010-05/1~9453^2~225
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee38ed000e7730986329388a9ea9df259f252a19;p=openembedded.git

Merge ... '574770392742c88b4d3a04f82d9c482f3b529ac7'
     and 'd61842e6dad3002a8c8c23c0ebd557b9e2bcd04f'
---

ee38ed000e7730986329388a9ea9df259f252a19