From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 29 Mar 2007 19:37:50 +0000 (+0000)
Subject: merge of '56b25a110aa475e3158b4ad35b8444a1da0716cb'
X-Git-Tag: Release-2010-05/1~8868^2~875^2~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05ff4add6b7a04c35631cbec817b5901ebef05b4;p=openembedded.git

Merge ... '56b25a110aa475e3158b4ad35b8444a1da0716cb'
     and '5a68fd7dd4ea1b818537db754ddc0d7ad79ca66b'
---

05ff4add6b7a04c35631cbec817b5901ebef05b4