From: Koen Kooi <koen@openembedded.org>
Date: Wed, 3 Oct 2007 12:38:36 +0000 (+0000)
Subject: merge of 'a806a9f3048bf953ea29faffb714688ab1a8d4d8'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca1d32f37e5515d92572ddeb03d594b8cb132060;p=openembedded.git

Merge ... 'a806a9f3048bf953ea29faffb714688ab1a8d4d8'
     and 'b197b98e05323ddd6e2f04f723ec87f58fe81d3b'
---

ca1d32f37e5515d92572ddeb03d594b8cb132060