From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 09:32:29 +0000 (+0000)
Subject: merge of 0761b04e198d6b93e945ee8583c37967707fa0cc
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f4577fe89794db00efa98d7614f5aaa87410ea6;p=openembedded.git

merge of 0761b04e198d6b93e945ee8583c37967707fa0cc
     and 50c5c306abf38a20f4b95edfc4146fe90deec59e
---

3f4577fe89794db00efa98d7614f5aaa87410ea6