From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 30 Dec 2006 05:17:12 +0000 (+0000)
Subject: merge of 4dfc2a473c46128476f166a00ad2fae6fdd1d9cd
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2^2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb84e0a1b4d29caf60c2ef8b658e909c0d770ed2;p=openembedded.git

merge of 4dfc2a473c46128476f166a00ad2fae6fdd1d9cd
     and e4fb13d2aed2025dca0345ebbb0130ece4a2321a
---

cb84e0a1b4d29caf60c2ef8b658e909c0d770ed2