From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 Aug 2006 21:31:01 +0000 (+0000)
Subject: merge of 7f2837654b6e146fe435c75d55d0e5f8440a2756
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~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=833eb3847c5a816d29824c1d8b6bec0fe5596f1b;p=openembedded.git

merge of 7f2837654b6e146fe435c75d55d0e5f8440a2756
     and bd9535d3bd721e7d44acd793a3ceca1f148991c8
---

833eb3847c5a816d29824c1d8b6bec0fe5596f1b