From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 2 Apr 2007 14:29:32 +0000 (+0000)
Subject: merge of '4d3d0b6ae8f717a39c5ed83392d7b9586ff20cd5'
X-Git-Tag: Release-2010-05/1~8868^2~853
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=216b6ede0706c0b7a560fd81269cd234a6c1bee1;p=openembedded.git

Merge ... '4d3d0b6ae8f717a39c5ed83392d7b9586ff20cd5'
     and 'd40606a5d7a1fb1d8ed2fc4c9f20c363df46cf11'
---

216b6ede0706c0b7a560fd81269cd234a6c1bee1