From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Jun 2007 08:19:25 +0000 (+0000)
Subject: merge of '89a72886df968d379bd23357295332d8f53340ac'
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~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95a5d2ab3a05e3d230adaa3b08a59961a280f579;p=openembedded.git

Merge ... '89a72886df968d379bd23357295332d8f53340ac'
     and 'c991e2697245e92213a1c3cb034b74b0ba5d25e4'
---

95a5d2ab3a05e3d230adaa3b08a59961a280f579