From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 31 Aug 2006 22:01:17 +0000 (+0000)
Subject: merge of 11b7563c2a1e1db7d344182fdb34864de1d1f04c
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e63518bc40c9d35cd65166ef4b5717a81f3f1b1;p=openembedded.git

merge of 11b7563c2a1e1db7d344182fdb34864de1d1f04c
     and 416f85f7a01f217e51a4cde5c03a5c7436c29749
---

4e63518bc40c9d35cd65166ef4b5717a81f3f1b1