From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 10 Dec 2006 11:31:37 +0000 (+0000)
Subject: merge of 48674f7dd589caad0d094f9897c833d3abe7b945
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^2^2^2^2~3^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5432214e5f7e4e1689b88d55c5f8609c6a30de6;p=openembedded.git

merge of 48674f7dd589caad0d094f9897c833d3abe7b945
     and ec6d6f07258675264c7e5bfb16e8d76d5f9373a5
---

e5432214e5f7e4e1689b88d55c5f8609c6a30de6