From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 24 Jan 2006 20:30:23 +0000 (+0000)
Subject: merge of 08771dbdc0003bc7f360b06dc077cb8a8205a699
X-Git-Tag: Release-2010-05/1~9453^2~2562
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4825542cef9b97462b86f8be1dfb5374727fbbe;p=openembedded.git

merge of 08771dbdc0003bc7f360b06dc077cb8a8205a699
     and 118e8965704196e1da0de17beb55e9816f7b3c89
---

b4825542cef9b97462b86f8be1dfb5374727fbbe