From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 31 Dec 2006 20:17:21 +0000 (+0000)
Subject: merge of 5e90ea32d08c39dcb59801e6c3df234c974417a7
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6563b0a885676c8989620e24595ae11d4d55877;p=openembedded.git

merge of 5e90ea32d08c39dcb59801e6c3df234c974417a7
     and cc3840f0580fb78a165bc656ebcaad1ebc6a1896
---

a6563b0a885676c8989620e24595ae11d4d55877