From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 20 Mar 2008 12:20:01 +0000 (+0000)
Subject: merge of '12eb583922c7b7778b159e3f0c2005fd35eeecf2'
X-Git-Tag: Release-2010-05/1~7317^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23de7a3b28cdf268b1cd5c9d25445244e55f62b2;p=openembedded.git

Merge ... '12eb583922c7b7778b159e3f0c2005fd35eeecf2'
     and '546fe3a8a6dffbbc40966ee0e8b1ea0c9ba2e9f2'
---

23de7a3b28cdf268b1cd5c9d25445244e55f62b2