From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 3 Sep 2005 14:07:04 +0000 (+0000)
Subject: merge of 796b997254855ff420d682f8dc76e72efcae336f
X-Git-Tag: Release-2010-05/1~9453^2~3672
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a1660cfb2225bbf4567b2322164ed89d029f975;p=openembedded.git

merge of 796b997254855ff420d682f8dc76e72efcae336f
     and ec654721498c715927f9b99127a77f4843f52adc
---

0a1660cfb2225bbf4567b2322164ed89d029f975