From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 4 Oct 2006 10:24:43 +0000 (+0000)
Subject: merge of 'c0c96c93651e80c74259da321b816cfa0c76a7a1'
X-Git-Tag: Release-2010-05/1~9453^2~615^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=668c42cb7e6ee3be1fb10dbc4c2e7f138734538b;p=openembedded.git

Merge ... 'c0c96c93651e80c74259da321b816cfa0c76a7a1'
     and 'e81ad8bbd55788f8132544a64394420053252ebf'
---

668c42cb7e6ee3be1fb10dbc4c2e7f138734538b