From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 12 Nov 2005 03:30:42 +0000 (+0000)
Subject: merge of 74c59e4808f6dc67198a09daba0fbe60e5560ec6
X-Git-Tag: Release-2010-05/1~9453^2~3107
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1814d0439d8465aae30fe3663268100f1f7686b9;p=openembedded.git

merge of 74c59e4808f6dc67198a09daba0fbe60e5560ec6
     and cc19bfba0e11a6d9efa601d46a5da31d5b24eb1e
---

1814d0439d8465aae30fe3663268100f1f7686b9