From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 11 Apr 2006 04:38:01 +0000 (+0000)
Subject: merge of 1b045e2618ad7f952f27e25154f22e90e12f88e0
X-Git-Tag: Release-2010-05/1~9453^2~2045^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b3f3f4da734d0f86331f1469c6c391dbda1368c;p=openembedded.git

merge of 1b045e2618ad7f952f27e25154f22e90e12f88e0
     and ec65eb2425626b59f384f8ab081929e9a4f8c5b4
---

3b3f3f4da734d0f86331f1469c6c391dbda1368c