From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 3 Jul 2007 16:56:39 +0000 (+0000)
Subject: merge of '2d48e0fc062c46f883515824089be8f20112f660'
X-Git-Tag: Release-2010-05/1~8868^2~225^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e66b8bf6f85be497947f41753a4a0f47dfb1c34;p=openembedded.git

Merge ... '2d48e0fc062c46f883515824089be8f20112f660'
     and '4a07a607b67720e33adbdc68da34bdc153b7f87d'
---

7e66b8bf6f85be497947f41753a4a0f47dfb1c34