From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 25 Mar 2007 10:36:58 +0000 (+0000)
Subject: merge of 'bb1e5c664095ed80fd4291b2edb5f4136cc3b55a'
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b77a2c4dafe665baff8535a440924e33a726d4e;p=openembedded.git

Merge ... 'bb1e5c664095ed80fd4291b2edb5f4136cc3b55a'
     and 'c03f5a74a6abc51297a66814aac66d5867322b6c'
---

7b77a2c4dafe665baff8535a440924e33a726d4e