From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 28 Nov 2005 21:11:57 +0000 (+0000)
Subject: merge of 6db5a6f376383e2d73ef38fa86ae25d51699b983
X-Git-Tag: Release-2010-05/1~9453^2~3002^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c5687e6e457fc5c24b8aaed9f787849f567a10f;p=openembedded.git

merge of 6db5a6f376383e2d73ef38fa86ae25d51699b983
     and 9afd2dba8f4f062cb27df95849c47aa62f3441dc
---

3c5687e6e457fc5c24b8aaed9f787849f567a10f