From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 7 Dec 2005 13:16:46 +0000 (+0000)
Subject: merge of 0693fb46494db1408733d460818b696a6d089cc6
X-Git-Tag: Release-2010-05/1~9453^2~2968^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01adcdc32700965baeaca4b1a3fbb1ca1ab36956;p=openembedded.git

merge of 0693fb46494db1408733d460818b696a6d089cc6
     and 635857df6c3fb5ea52e288d7b847d28c28cbbdf7
---

01adcdc32700965baeaca4b1a3fbb1ca1ab36956