From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 6 Feb 2007 12:15:48 +0000 (+0000)
Subject: merge of '02f69e2f1f96fe3176524c6d19a802651c0d6d3e'
X-Git-Tag: Release-2010-05/1~9271^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54d51767437734ac3cc691c2b599b59bc6581916;p=openembedded.git

Merge ... '02f69e2f1f96fe3176524c6d19a802651c0d6d3e'
     and '465f7e87f6e551f0e50fb24f3912a466a20587b1'
---

54d51767437734ac3cc691c2b599b59bc6581916