From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 25 Dec 2006 12:16:43 +0000 (+0000)
Subject: merge of 6bfd9403f72a27b0681b16fca8d367883c564eb4
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=073f850c1e8f94177501cc859a94fdedf2d7fbc0;p=openembedded.git

merge of 6bfd9403f72a27b0681b16fca8d367883c564eb4
     and 8da25be9d5f9817c31c2411800229cd33b9dc184
---

073f850c1e8f94177501cc859a94fdedf2d7fbc0