From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Mar 2007 04:14:56 +0000 (+0000)
Subject: merge of '5aa897219a6f3b729b2bff6aaff9cf260b3a25c3'
X-Git-Tag: Release-2010-05/1~8868^2~875^2~10^2~1^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e253e75395f1c51a09fe43d7161d72cce797f1c;p=openembedded.git

Merge ... '5aa897219a6f3b729b2bff6aaff9cf260b3a25c3'
     and 'd89d03fe156d1bafcd5fc8aecd1ff5aa14ee23ed'
---

9e253e75395f1c51a09fe43d7161d72cce797f1c