From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 29 Dec 2006 20:35:06 +0000 (+0000)
Subject: merge of 0da211d2733480bc91dcce75cae6b2165b0c873f
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2^2^2^2^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb72ae1b21491018f7777d211aca948ce4511d71;p=openembedded.git

merge of 0da211d2733480bc91dcce75cae6b2165b0c873f
     and 8b3597c2174798b0e22b0c752ade70a447dd991a
---

cb72ae1b21491018f7777d211aca948ce4511d71