From: Graeme Gregory <dp@xora.org.uk>
Date: Sun, 7 Jan 2007 22:28:23 +0000 (+0000)
Subject: merge of '031a650eb799f1540b4d16dd84e63a11ea58463c'
X-Git-Tag: Release-2010-05/1~9420^2~20^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c82949168aaee0b2dcfff621dab5abd5e5b0116;p=openembedded.git

Merge ... '031a650eb799f1540b4d16dd84e63a11ea58463c'
     and '199b94068183639a7d0f5c71711782b991bb9812'
---

0c82949168aaee0b2dcfff621dab5abd5e5b0116