From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 13 Apr 2006 23:29:22 +0000 (+0000)
Subject: merge of 001fcb061c24478ee6716a3e6160ebc3c9103b80
X-Git-Tag: Release-2010-05/1~9453^2~1954^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce83245863a25f24c0182a8bb97d7418b6554e5f;p=openembedded.git

merge of 001fcb061c24478ee6716a3e6160ebc3c9103b80
     and f627a8139e18a20e37bb4ad48de937eded7216f3
---

ce83245863a25f24c0182a8bb97d7418b6554e5f