From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 30 Dec 2006 00:03:08 +0000 (+0000)
Subject: merge of 6b7f9cf3f65ad039a833daa763ba3ce580f1bda3
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2af3da347e7c4fab6cdf50369b6d1d52c0fc392;p=openembedded.git

merge of 6b7f9cf3f65ad039a833daa763ba3ce580f1bda3
     and c465aa2afe45bc4074882eea0d2ce1b9369b5707
---

d2af3da347e7c4fab6cdf50369b6d1d52c0fc392