From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 14 Dec 2006 15:18:38 +0000 (+0000)
Subject: merge of 0c6d0887b83f5cfd506da4e77d3431832c49a46b
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^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd3e542ac0fad94ae4907e7b370ca68273fd146e;p=openembedded.git

merge of 0c6d0887b83f5cfd506da4e77d3431832c49a46b
     and 40da8c329d334d7ca4306f4b2789fe63e92ae52b
---

fd3e542ac0fad94ae4907e7b370ca68273fd146e