From: Holger Freyther <zecke@selfish.org>
Date: Thu, 31 May 2007 11:50:04 +0000 (+0000)
Subject: merge of '36f14d73e014c31eddebc1591ca83ba7baf264fe'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~120^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a441b927775fa54ee7e3bae2292719fd4c9179e9;p=openembedded.git

Merge ... '36f14d73e014c31eddebc1591ca83ba7baf264fe'
     and '5fdb0dc4b9d46e93ef2f8167972489b652ad5830'
---

a441b927775fa54ee7e3bae2292719fd4c9179e9