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

merge of add0b992da90062461f1e0cac228c2846af2e1bd
     and b66f8aa97a30d7b5f6212f1847e4d269bb2942eb
---

9277f8bd534de8dcd25cf5de425774bd02abea46