From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 1 Dec 2006 20:23:34 +0000 (+0000)
Subject: merge of '2f5488a316106b94b9b819b0cca9b23352724d0f'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~47
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=177e5b7476b24b6156fbf50788fcd6f07137897f;p=openembedded.git

Merge ... '2f5488a316106b94b9b819b0cca9b23352724d0f'
     and 'ccb9ca1370f5bfcbef794de33758dbc89a29055f'
---

177e5b7476b24b6156fbf50788fcd6f07137897f