From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 8 Mar 2007 22:13:15 +0000 (+0000)
Subject: merge of '685f49aca74594ca1579d7481b11e07b315708e8'
X-Git-Tag: Release-2010-05/1~8868^2~1099^2~2^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d37fa8011c7976226f659388384eebdb95cd73c;p=openembedded.git

Merge ... '685f49aca74594ca1579d7481b11e07b315708e8'
     and 'fb386b14fd62e2255bdaaa1edca0a4ad6adf82c9'
---

4d37fa8011c7976226f659388384eebdb95cd73c