From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 5 Nov 2006 09:48:50 +0000 (+0000)
Subject: merge of '2fb021b9821c36a4c1cbd5a8f6f8587212618043'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c4ef8eca4f8f6480619e740f9b756d66af212f3;p=openembedded.git

Merge ... '2fb021b9821c36a4c1cbd5a8f6f8587212618043'
     and 'b2778861a51174fffe28fe33526d2ac123442b0e'
---

2c4ef8eca4f8f6480619e740f9b756d66af212f3