From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Sep 2006 10:31:19 +0000 (+0000)
Subject: merge of 2b731b6c8282c7d942d3117af572616c0d9c89db
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b837ee8cdb236033f6556c317df57376398a5af;p=openembedded.git

merge of 2b731b6c8282c7d942d3117af572616c0d9c89db
     and ef77933d5704679f765d4a7cb23001c0565e8c15
---

7b837ee8cdb236033f6556c317df57376398a5af