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

Merge ... '6f4b6bf3d2e7f2cfd02b30cd615680a0a673fe68'
     and 'd7114bf167db1226dc6a0dbcf6f063728c94eaf0'
---

62792dce4247b9165591e6367bae89ab36b1478d