From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Sep 2006 01:16:34 +0000 (+0000)
Subject: merge of c6f51b08eabf922e93feada29159ba2de2a5caec
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f3cf53b6f0c3d93e045c6c22b0bf140638e5f3b;p=openembedded.git

merge of c6f51b08eabf922e93feada29159ba2de2a5caec
     and d392153f540fb53432b333f95c079d221f6570f1
---

7f3cf53b6f0c3d93e045c6c22b0bf140638e5f3b