From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 13 Jan 2006 20:25:25 +0000 (+0000)
Subject: merge of 4daf34d7b97dde040c825249e39abc6af0abf493
X-Git-Tag: Release-2010-05/1~9453^2~2654
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbf67faea13558e9ad23b6faca2c0745630f8939;p=openembedded.git

merge of 4daf34d7b97dde040c825249e39abc6af0abf493
     and 7f6d02bad0d27e0bd6a0d6e493318b5275142389
---

bbf67faea13558e9ad23b6faca2c0745630f8939