From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 24 Dec 2006 03:16:55 +0000 (+0000)
Subject: merge of 0f4c7b9e539d7c0a849ae138f7f34bb62ae3bb24
X-Git-Tag: Release-2010-05/1~9453^2~27^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5b35d6807d71c56135df1ed405731992f9c3150;p=openembedded.git

merge of 0f4c7b9e539d7c0a849ae138f7f34bb62ae3bb24
     and 49f9287272ddf4c93c47c0d79762d5a118ea468f
---

e5b35d6807d71c56135df1ed405731992f9c3150