From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 13 Oct 2006 00:01:42 +0000 (+0000)
Subject: merge of 01258feaf6b6bd7e383e43692fd47a44c7c97738
X-Git-Tag: Release-2010-05/1~9453^2~567^2~212^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=540c4f485b453589cfa56cd6a8b3b57d491fc924;p=openembedded.git

merge of 01258feaf6b6bd7e383e43692fd47a44c7c97738
     and b2d995227aebc5a8062a86981a2a4616cff0383e
---

540c4f485b453589cfa56cd6a8b3b57d491fc924