From: Graeme Gregory <dp@xora.org.uk>
Date: Sun, 10 Dec 2006 23:25:59 +0000 (+0000)
Subject: merge of '361f5e7496f085af56d5712f1b0cfa108c430f27'
X-Git-Tag: Release-2010-05/1~9453^2~173^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8be48ef62d9285fae3ad99ea1b8d0a129e2372eb;p=openembedded.git

Merge ... '361f5e7496f085af56d5712f1b0cfa108c430f27'
     and 'bb035df7efb73705f61ef917e0a6160eb1f2dfdb'
---

8be48ef62d9285fae3ad99ea1b8d0a129e2372eb