From: Koen Kooi <koen@openembedded.org>
Date: Sun, 12 Nov 2006 13:27:50 +0000 (+0000)
Subject: merge of '4e4a2d2a3c172e0018ad8039dd9f8ac05a09e270'
X-Git-Tag: Release-2010-05/1~9453^2~481^2^2~17^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35fcead835867255bafc55566ef63df79ff3df7e;p=openembedded.git

Merge ... '4e4a2d2a3c172e0018ad8039dd9f8ac05a09e270'
     and 'd3403321e11792348c80c7e027874c49dd3ae4b1'
---

35fcead835867255bafc55566ef63df79ff3df7e