From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 4 Jul 2005 06:16:08 +0000 (+0000)
Subject: merge of ae6fbd3f4f93f8e0906759e4400adf3931497034
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~155
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e48846d7f7f9290cc3bae5b871a7494be267ace;p=openembedded.git

merge of ae6fbd3f4f93f8e0906759e4400adf3931497034
     and e0471b414921ae62c648ae5e1fad7517dcef3dea
---

8e48846d7f7f9290cc3bae5b871a7494be267ace