From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 19 Aug 2006 12:16:09 +0000 (+0000)
Subject: merge of 1325f1127b878ef40c132892d17287ce5f1c1148
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16db62c98bc691667b797c90fc71d85e4f830809;p=openembedded.git

merge of 1325f1127b878ef40c132892d17287ce5f1c1148
     and b40cd07f7fdbc8f9356c65eaf44ca21e4e2fdcf7
---

16db62c98bc691667b797c90fc71d85e4f830809