From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 14 Dec 2006 12:17:20 +0000 (+0000)
Subject: merge of 3da2caa6a3dac230f20ffcd1b963e933f744dbfa
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~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09895a6ebe25551c23296820359f7f8756aa96ef;p=openembedded.git

merge of 3da2caa6a3dac230f20ffcd1b963e933f744dbfa
     and c30e9d5fa2ac933e9c3df9f75465c891732a9107
---

09895a6ebe25551c23296820359f7f8756aa96ef