From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 14 Dec 2006 16:47:23 +0000 (+0000)
Subject: merge of 98e0cf8d3e683fd10afcf14894a3058c23e2b5f0
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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f54951cb145ed892ae905991094b210e824bbf6;p=openembedded.git

merge of 98e0cf8d3e683fd10afcf14894a3058c23e2b5f0
     and ce67547384f217f30ce45422ea9293803aa35f00
---

6f54951cb145ed892ae905991094b210e824bbf6