From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 5 Dec 2005 19:16:15 +0000 (+0000)
Subject: merge of 3da3c8510f28cecce26d43c429a795ef96d73c91
X-Git-Tag: Release-2010-05/1~9453^2~2967^2~3^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67a233ecaa6ac6f117f7792429b489f806b320b3;p=openembedded.git

merge of 3da3c8510f28cecce26d43c429a795ef96d73c91
     and 7b0b984392478c157095acc3ffa870911991d32a
---

67a233ecaa6ac6f117f7792429b489f806b320b3