From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 4 Apr 2007 12:10:08 +0000 (+0000)
Subject: merge of '0dce271df8041510469d6f47bc99206c42c821e1'
X-Git-Tag: Release-2010-05/1~8868^2~780^2~16^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7807a6a7ee656b2cd702124cd227d2f1b8f39c96;p=openembedded.git

Merge ... '0dce271df8041510469d6f47bc99206c42c821e1'
     and '5a224ad42c629112a32b3825f26fb2c33dee1b3b'
---

7807a6a7ee656b2cd702124cd227d2f1b8f39c96