From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 27 Dec 2006 21:07:06 +0000 (+0000)
Subject: merge of 2bce4e429b6826e376c7bb1d60ceaad4e7dd26bf
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=022aa634e117494a77432541c1b92b585069addc;p=openembedded.git

merge of 2bce4e429b6826e376c7bb1d60ceaad4e7dd26bf
     and 55c211eeea062bae0ddabf49b85ecec1bb363f48
---

022aa634e117494a77432541c1b92b585069addc