From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 3 Sep 2006 19:31:19 +0000 (+0000)
Subject: merge of ae090523c163ff0d1e234b0d89d1450a2466b4b4
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5^2~1^2^2~1^2^2~2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=744afbc831ef1668fa6ac46b437bde37a03189ba;p=openembedded.git

merge of ae090523c163ff0d1e234b0d89d1450a2466b4b4
     and c2323b82e0e9d8a26ab8a908e6384895c0070933
---

744afbc831ef1668fa6ac46b437bde37a03189ba