From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 14 Jan 2008 14:20:42 +0000 (+0000)
Subject: merge of '47a018f2318445ba4e71d5969574adb98e48f062'
X-Git-Tag: Release-2010-05/1~7926
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b1747b9ce29a934e8acb9e25daac5191237f462;p=openembedded.git

Merge ... '47a018f2318445ba4e71d5969574adb98e48f062'
     and 'f6cc9b68982be345f6c9c58f1cc5894d7d878d10'
---

3b1747b9ce29a934e8acb9e25daac5191237f462