From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 1 Dec 2005 20:47:23 +0000 (+0000)
Subject: merge of 6a57c3e22fd06a31041fbb55ad83504a24c0b864
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ef1a5c51ba93db382fcab0d84d937fc74b79692;p=openembedded.git

merge of 6a57c3e22fd06a31041fbb55ad83504a24c0b864
     and dd8083dd620f2b95bcfa4b4878d1c64240995a10
---

3ef1a5c51ba93db382fcab0d84d937fc74b79692