From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 23 Aug 2006 00:16:21 +0000 (+0000)
Subject: merge of 4397d57a129563fde1aa8ebd31aadee8edbd8994
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=717270bddeb57118630bb7d92554512dac717798;p=openembedded.git

merge of 4397d57a129563fde1aa8ebd31aadee8edbd8994
     and 5c6bd9229c2912167e04e747499aa015e936f86e
---

717270bddeb57118630bb7d92554512dac717798