From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 7 Feb 2007 16:31:13 +0000 (+0000)
Subject: merge of '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'
X-Git-Tag: Release-2010-05/1~9268^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77d71931684db18dacb648a9dd2f804829983df4;p=openembedded.git

Merge ... '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'
     and 'ceb628b9d1e93ba31a266b15bf06b5527054eaf3'
---

77d71931684db18dacb648a9dd2f804829983df4