From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 6 Apr 2007 15:03:18 +0000 (+0000)
Subject: merge of '10a90319e7dcbab1d8c8d9e534ce161d889b7a16'
X-Git-Tag: Release-2010-05/1~8868^2~771^2^2~2^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebfb692591df0f4fa68b6aef0afa23c20cf78879;p=openembedded.git

Merge ... '10a90319e7dcbab1d8c8d9e534ce161d889b7a16'
     and '8936e843ac2f12f5699d90cb2e20ef1c8b4ce48b'
---

ebfb692591df0f4fa68b6aef0afa23c20cf78879