From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 21 Aug 2006 00:46:10 +0000 (+0000)
Subject: merge of 4b5a9c36e8db98bd960824fe82d251052de80c28
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed51b9b2e50f9fdd1d71036d8489c9b57a84b4be;p=openembedded.git

merge of 4b5a9c36e8db98bd960824fe82d251052de80c28
     and 91eb3994730b15f22d72f00740f5ff46a272f2f7
---

ed51b9b2e50f9fdd1d71036d8489c9b57a84b4be