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

merge of f1d7476860f569e3fa2e97db12daf5c4513332f8
     and fc5123f58f239212f219acea3e4433f4379af386
---

e6a2b2ac8dcb7e97c6cca25da0cce4baa0e80059