From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 13 Oct 2006 13:01:08 +0000 (+0000)
Subject: merge of 11fba4b61b1e587f931023844ab267d82fa5c080
X-Git-Tag: Release-2010-05/1~9453^2~567^2~206
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88ef57373e921bf59253f8fb2939763b3036444a;p=openembedded.git

merge of 11fba4b61b1e587f931023844ab267d82fa5c080
     and 8b1b5b68ff8d4cf09a34113688ed651d6ea3c6cd
---

88ef57373e921bf59253f8fb2939763b3036444a