From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 1 Aug 2006 10:01:09 +0000 (+0000)
Subject: merge of '4113b1ae96ce03fbc8d4476d1cda0056a909f94e'
X-Git-Tag: Release-2010-05/1~9453^2~1032
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4127bb0c66be5abe0e4e7247a00989bab3462d02;p=openembedded.git

Merge ... '4113b1ae96ce03fbc8d4476d1cda0056a909f94e'
     and 'f38165a0ab5b3933a6a8d8aff06ed4213e76b9ab'
---

4127bb0c66be5abe0e4e7247a00989bab3462d02