From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 25 Jul 2005 05:50:33 +0000 (+0000)
Subject: merge of 01da64932255dd642486fc7d1b0b0237725f1d3d
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97f49d823ce6e3559ff56f18ecaa33e53016e3ab;p=openembedded.git

merge of 01da64932255dd642486fc7d1b0b0237725f1d3d
     and 34ddaad8b7ba08ab8bb1dabec603f4661b32c4b7
---

97f49d823ce6e3559ff56f18ecaa33e53016e3ab