From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 25 Jan 2008 11:42:27 +0000 (+0000)
Subject: merge of '52333e2ff8a0a55bff7597d29b54ad3d0e836033'
X-Git-Tag: Release-2010-05/1~7838^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e1f9cf27db4407081365f265a0e62ff71852696;p=openembedded.git

Merge ... '52333e2ff8a0a55bff7597d29b54ad3d0e836033'
     and '7164da9fb8de274ee480409ef0b6ce02db5de39b'
---

1e1f9cf27db4407081365f265a0e62ff71852696