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

merge of 6d5e280f97056828cda3dfddd3b587deb43de909
     and ceae4a8f497f23a63ce5818c0874acbac77f2205
---

4a80f1244221dd024fc6d2d340a0ce3ab66479c1