From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 May 2007 23:42:30 +0000 (+0000)
Subject: merge of 'af9c4bad732edd2f3538bbcc59c4aa70520a54e1'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d033c921f689c4ab291d63c3a6bdbb5256b0b315;p=openembedded.git

Merge ... 'af9c4bad732edd2f3538bbcc59c4aa70520a54e1'
     and 'e35c79c0e44e6a58add42e2dc50ecfaad4e02c0e'
---

d033c921f689c4ab291d63c3a6bdbb5256b0b315