From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 2 Jan 2007 01:18:03 +0000 (+0000)
Subject: merge of c598e249842cbe91970bb34d033cec3f7506d983
X-Git-Tag: Release-2010-05/1~9453^2~35^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d5f5771ddede792e647d9af23811affdee4edd;p=openembedded.git

merge of c598e249842cbe91970bb34d033cec3f7506d983
     and dc166a634d98eed0d4db914b9baa853e0041ee57
---

83d5f5771ddede792e647d9af23811affdee4edd