From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 23 Oct 2007 11:51:42 +0000 (+0000)
Subject: merge of '9de07e481a86e3f14756eb2ba1a6101ccb1cc6b7'
X-Git-Tag: Release-2010-05/1~8454^2~165^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12e1b9ea47f4ca31147978748522ad851fcd5a3e;p=openembedded.git

Merge ... '9de07e481a86e3f14756eb2ba1a6101ccb1cc6b7'
     and 'e930cc8c870552eea45fd56db9c1b737a0982b2e'
---

12e1b9ea47f4ca31147978748522ad851fcd5a3e