From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 29 Mar 2007 14:55:17 +0000 (+0000)
Subject: merge of '113174d33136a54f14b81e89817064146ea7422c'
X-Git-Tag: Release-2010-05/1~8868^2~910^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03b7dd2e8376b90878adbbb4cf362f3313b24aec;p=openembedded.git

Merge ... '113174d33136a54f14b81e89817064146ea7422c'
     and 'e537e43379a96a77d936e5011051050129d6a7f9'
---

03b7dd2e8376b90878adbbb4cf362f3313b24aec