From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 10:17:36 +0000 (+0000)
Subject: merge of 63a6f6349530accb6a38bc556a6c380e3bf4d32c
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~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2999418596562720e352f36326bbe80c9712f74;p=openembedded.git

merge of 63a6f6349530accb6a38bc556a6c380e3bf4d32c
     and db250e90647c3e4170f1c2c8ebc6116f90005436
---

d2999418596562720e352f36326bbe80c9712f74