From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 24 Dec 2006 18:03:08 +0000 (+0000)
Subject: merge of 5424fac9de94208647a948e1cf5e2b00fb7dec90
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2^2~2^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dedf0d9e04bb2bb1ab0b338065584fc2540f8953;p=openembedded.git

merge of 5424fac9de94208647a948e1cf5e2b00fb7dec90
     and 56608badb3c66e42a7caddfbac78081041eb2557
---

dedf0d9e04bb2bb1ab0b338065584fc2540f8953