From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 15 Nov 2006 07:34:46 +0000 (+0000)
Subject: merge of 2d9eee8c16bb6bb0232beade8d8538e6a55c577e
X-Git-Tag: Release-2010-05/1~9453^2~490
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfca6a11f1e6289fa0ee4a436e639e83573c61be;p=openembedded.git

merge of 2d9eee8c16bb6bb0232beade8d8538e6a55c577e
     and ed9696ef4fb1a4ce6b21e46ad70e0bb8e9e4c556
---

dfca6a11f1e6289fa0ee4a436e639e83573c61be