From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 15:17:50 +0000 (+0000)
Subject: merge of 60762442fc41883c42e53594dcf5674ab0eaaf7c
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f179d87fb7c1296f8565938332a7d878a0fad44;p=openembedded.git

merge of 60762442fc41883c42e53594dcf5674ab0eaaf7c
     and 7ab404ab2173ae6f075b0f3345558a26d9bf9ef1
---

9f179d87fb7c1296f8565938332a7d878a0fad44