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

merge of 0cbb13c94d1d354d5287fb1b304b348fa2003d0c
     and a21672eaa3285e42fbfeefbb8e1bd68923c357e9
---

a98a49816bcbad04b23db4ab641fe066503732ce