From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 27 Nov 2006 11:54:00 +0000 (+0000)
Subject: merge of '6665f976182e5c32b4c7db403b5591aae3ae836f'
X-Git-Tag: Release-2010-05/1~9453^2~272
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b7e5304929813d73699f9c961da1b631bdee3cd;p=openembedded.git

Merge ... '6665f976182e5c32b4c7db403b5591aae3ae836f'
     and 'f2cd362e8e2df79c128decce8793c83a2a7b30f1'
---

7b7e5304929813d73699f9c961da1b631bdee3cd