From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 7 Aug 2007 10:49:26 +0000 (+0000)
Subject: merge of '526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab'
X-Git-Tag: Release-2010-05/1~9076^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a0743356e12a0a7e5aa7210befb2cac329af824;p=openembedded.git

Merge ... '526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab'
     and '614f3cd98efac6f55a67e861fea4265d5be81963'
---

1a0743356e12a0a7e5aa7210befb2cac329af824