From: Graeme Gregory <dp@xora.org.uk>
Date: Sat, 20 Oct 2007 09:33:22 +0000 (+0000)
Subject: merge of '1fb08a078d2758934f02fa5ac848b7c6a7e2cb31'
X-Git-Tag: Release-2010-05/1~8508
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d129deb895698eaf8eef9c10da8b7fc1b3ed4fe6;p=openembedded.git

Merge ... '1fb08a078d2758934f02fa5ac848b7c6a7e2cb31'
     and '6826902a15e323563ac6b3f1a902a98dcabe27e9'
---

d129deb895698eaf8eef9c10da8b7fc1b3ed4fe6