From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 7 Feb 2007 11:22:41 +0000 (+0000)
Subject: merge of '18cf39ef0f56ba2b40f997fc34cf59f15054e7c4'
X-Git-Tag: Release-2010-05/1~9271^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9f37c0798f2227c11758c60f21ecc0672c6b596;p=openembedded.git

Merge ... '18cf39ef0f56ba2b40f997fc34cf59f15054e7c4'
     and 'be5bce993001e07eb5e869f8796ea1b1d05f3472'
---

f9f37c0798f2227c11758c60f21ecc0672c6b596