From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 14 Apr 2006 17:43:18 +0000 (+0000)
Subject: merge of 9b708457afab2c6fe10cebf3363b9e3047e82cdf
X-Git-Tag: Release-2010-05/1~9453^2~1915
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8cd328180f9105b8b6ebe9598ef2a80a76d9b0c;p=openembedded.git

merge of 9b708457afab2c6fe10cebf3363b9e3047e82cdf
     and aa50c5a00e165f90e9a5f70bdf46104508a46fcc
---

e8cd328180f9105b8b6ebe9598ef2a80a76d9b0c