From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 11 Nov 2005 15:08:29 +0000 (+0000)
Subject: merge of 0c6591535a11955c424cb90d7a157b640d408d35
X-Git-Tag: Release-2010-05/1~9453^2~3113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d83b739ea1605aa228d095e9c06a339d01db47d;p=openembedded.git

merge of 0c6591535a11955c424cb90d7a157b640d408d35
     and 38425be5fd91cb4948ea49598a78227846a0b730
---

7d83b739ea1605aa228d095e9c06a339d01db47d