From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 30 Jul 2007 21:33:56 +0000 (+0000)
Subject: merge of '7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e'
X-Git-Tag: Release-2010-05/1~8868^2~66
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=673c15addeb79e8333ac0dd770f2332e6dba59ce;p=openembedded.git

Merge ... '7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e'
     and 'aaed7d89c2d2f9469b923a2d2d65c83ad37bc838'
---

673c15addeb79e8333ac0dd770f2332e6dba59ce