From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 14:18:17 +0000 (+0000)
Subject: merge of 03286e05287c9be2dc05021f2b6006efd7d30f3a
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f21938dfe001bd4573fce53cc1343082f8822d39;p=openembedded.git

merge of 03286e05287c9be2dc05021f2b6006efd7d30f3a
     and a6590ff2f21ebb43ab29209d0580dc897c1c1993
---

f21938dfe001bd4573fce53cc1343082f8822d39