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

merge of 4ad930ecebbebfaf8e7325b94976438d1d35bd4f
     and ef7b9f80525af0b2374045ede01ecc82e2b7cac8
---

fdd88a49ac19c9665fdd046f22e1dde9fec127e2