From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 9 Aug 2005 18:00:24 +0000 (+0000)
Subject: merge of 4244fcc1342db41f3c990bf797b685be65d4edaa
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~22^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=814e36a4de03f42f9c8291c2d6e68cdadcae8bae;p=openembedded.git

merge of 4244fcc1342db41f3c990bf797b685be65d4edaa
     and a76f350b51bedef01b414ca428726bc656900e86
---

814e36a4de03f42f9c8291c2d6e68cdadcae8bae