From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 13 Jan 2006 23:30:25 +0000 (+0000)
Subject: merge of 3ef88e1af076f327d80f58bf19c627bb32b6b865
X-Git-Tag: Release-2010-05/1~9453^2~2663
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a048cc09baf8498736e25699ca85b3c69a01adb;p=openembedded.git

merge of 3ef88e1af076f327d80f58bf19c627bb32b6b865
     and 919c016d00fbf315110a2c0151d233033ef926d4
---

5a048cc09baf8498736e25699ca85b3c69a01adb