From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 Aug 2006 09:46:29 +0000 (+0000)
Subject: merge of ae3a0b7d18ecf27edb385f86701998e25888d0c3
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^2^2^2~1^2~2^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2~3^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03541f327d05a2f378409de02f9962f06c553287;p=openembedded.git

merge of ae3a0b7d18ecf27edb385f86701998e25888d0c3
     and da7632a154580311895110a4f07328ec4c6ed8fe
---

03541f327d05a2f378409de02f9962f06c553287