From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 1 Dec 2005 18:31:43 +0000 (+0000)
Subject: merge of 11d6bd95a0db23f96eb6c52d8212e35447cb7a4c
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=137af3e75ed807afa7e76a6b6052663ecd539b93;p=openembedded.git

merge of 11d6bd95a0db23f96eb6c52d8212e35447cb7a4c
     and 4b8efd8ea23df73f8397284e81b3d7ba92173f77
---

137af3e75ed807afa7e76a6b6052663ecd539b93