From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 26 Nov 2006 13:47:35 +0000 (+0000)
Subject: merge of 101cc837c8a2d1c2d4abc0f9ed9415554cbb609c
X-Git-Tag: Release-2010-05/1~9453^2~285
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac617615d1c4aeb68c2f0fcbfa20ab670943f8b4;p=openembedded.git

merge of 101cc837c8a2d1c2d4abc0f9ed9415554cbb609c
     and 95d8882549c61d28fd1ccd1223c761df50dfcebb
---

ac617615d1c4aeb68c2f0fcbfa20ab670943f8b4