From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 16 Aug 2006 03:16:21 +0000 (+0000)
Subject: merge of 8c12c313f6826aa8f20205f0d2756a8970c8e730
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4^2^2~2^2^2^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=590625678f1c6a80058789ad07e41f47d1f4cad4;p=openembedded.git

merge of 8c12c313f6826aa8f20205f0d2756a8970c8e730
     and f54c97bd2fc98befdf9aec819418dddcc1d14b9a
---

590625678f1c6a80058789ad07e41f47d1f4cad4