From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 24 Mar 2007 13:21:25 +0000 (+0000)
Subject: merge of '42e4a37b3bc1bce6b8ffb4ca48e06f8b74e5797a'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2^2~4^2~1^2~1^2^2^2^2^2~1^2^2^2~1^2^2^2^2~7^2^2~1^2^2~1^2~2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c303e22bb0a8941a383aaf82947068b0ebebf57;p=openembedded.git

Merge ... '42e4a37b3bc1bce6b8ffb4ca48e06f8b74e5797a'
     and 'd583b83b9659b4a2ce57f16c9a02e0d6ddcb01c8'
---

8c303e22bb0a8941a383aaf82947068b0ebebf57