From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 5 Nov 2007 19:59:01 +0000 (+0000)
Subject: merge of '1c37802f675e2b4ebbb302f90f516adf37617e96'
X-Git-Tag: Release-2010-05/1~8454^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92b995d7bd8e3e45a61ff52063105c490f1aee55;p=openembedded.git

Merge ... '1c37802f675e2b4ebbb302f90f516adf37617e96'
     and 'ef25a12d53bd49cd4c94de426d2b1c981c967f93'
---

92b995d7bd8e3e45a61ff52063105c490f1aee55