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

merge of ac6e8d15cf5ae7a73c08461735cc5b67f8327d2b
     and d6ffec8e4eb73fb29b2514e3e31be33cfa76542e
---

1c0f065147987103a23908fcdc954834df3dad5f