From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 22 Nov 2006 11:32:24 +0000 (+0000)
Subject: merge of '83d98662c6868a7aa140a2381a42dd66253867b5'
X-Git-Tag: Release-2010-05/1~9453^2~332
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b63429de66913920d76795eb19af26b211bd5d3;p=openembedded.git

Merge ... '83d98662c6868a7aa140a2381a42dd66253867b5'
     and '959a6162fa3ea78b9386188cf845e87e4556c6f8'
---

1b63429de66913920d76795eb19af26b211bd5d3