From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 19:17:57 +0000 (+0000)
Subject: merge of 3a2b24b57d281073e460c3d96127ccc1a078d6e8
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79d222c03503850f00617df1f4cd193c73089b8d;p=openembedded.git

merge of 3a2b24b57d281073e460c3d96127ccc1a078d6e8
     and 78dea452022bd67f5eb43bca810200062cd47e56
---

79d222c03503850f00617df1f4cd193c73089b8d