From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 27 Dec 2006 22:53:25 +0000 (+0000)
Subject: merge of '3c8de2560478b42631b53f526f6839d2a4403cc9'
X-Git-Tag: Release-2010-05/1~9453^2~94
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9495c1d41d6447f944798f9d88a85bd42a5b4a54;p=openembedded.git

Merge ... '3c8de2560478b42631b53f526f6839d2a4403cc9'
     and '7255f9463a418dff8966b4189b5210a7ea8df038'
---

9495c1d41d6447f944798f9d88a85bd42a5b4a54