From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Nov 2007 12:37:26 +0000 (+0000)
Subject: merge of '6b94c6eeda0e3ff2069f19a1f393df67d80bebe9'
X-Git-Tag: Release-2010-05/1~8252^2~1^2~4^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afe44a1b179786201362ed9c5a9e3cb93ba5d88f;p=openembedded.git

Merge ... '6b94c6eeda0e3ff2069f19a1f393df67d80bebe9'
     and 'f7531c375389681cc06ea3169fea009301b94267'
---

afe44a1b179786201362ed9c5a9e3cb93ba5d88f