From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 29 Jun 2006 19:46:48 +0000 (+0000)
Subject: merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
X-Git-Tag: Release-2010-05/1~9453^2~1366^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=079a67fc75edf4d2671ed9cbef0d77870450920e;p=openembedded.git

merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
     and 6ccfcb3e298f740c7e45b8312a95877c3f842f6d
---

079a67fc75edf4d2671ed9cbef0d77870450920e