From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Sep 2006 12:46:18 +0000 (+0000)
Subject: merge of 9faa5f9bca0726d8c098e3f9aa7f0b947799029b
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8f71064816c7adb3c25705f136c46aad1d5cce6;p=openembedded.git

merge of 9faa5f9bca0726d8c098e3f9aa7f0b947799029b
     and c7f9d50b7c841b95987caa4aeb4d61c1902a3542
---

f8f71064816c7adb3c25705f136c46aad1d5cce6