From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Mon, 20 Aug 2007 17:55:36 +0000 (+0000)
Subject: merge of '93974111864d318a6e96f9646847c5a9647aa819'
X-Git-Tag: Release-2010-05/1~8869
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de542fe9877144b7e0bd5226e0a3841887ce6c89;p=openembedded.git

Merge ... '93974111864d318a6e96f9646847c5a9647aa819'
     and 'f7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6'
---

de542fe9877144b7e0bd5226e0a3841887ce6c89