From: Koen Kooi <koen@openembedded.org>
Date: Tue, 28 Nov 2006 15:15:48 +0000 (+0000)
Subject: merge of '190c717fcefa9f89f739dac0295c41c977c5f2da'
X-Git-Tag: Release-2010-05/1~9453^2~254
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f22607c68edda356b86c5b5433c316b49546275d;p=openembedded.git

Merge ... '190c717fcefa9f89f739dac0295c41c977c5f2da'
     and '1fb8812d36f505cfabe9ee2335441ada60e32f83'
---

f22607c68edda356b86c5b5433c316b49546275d