From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 19:48:50 +0000 (+0000)
Subject: merge of 883aa5812e7df804d1bb7c488427d4534a7a84f5
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14a9f8616cf691805a8041d09074816c6f0a687e;p=openembedded.git

merge of 883aa5812e7df804d1bb7c488427d4534a7a84f5
     and b42e50214bebba155e60a6ae69b734434b915d35
---

14a9f8616cf691805a8041d09074816c6f0a687e