From: Philip Balister <philip@balister.org>
Date: Fri, 20 Oct 2006 14:24:14 +0000 (+0000)
Subject: merge of 'd33422da66ef97a509fd9df76b3af823a8016631'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~71^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aa0fbd1d5ae7f6476129809f29ee3cda7e6a8ef;p=openembedded.git

Merge ... 'd33422da66ef97a509fd9df76b3af823a8016631'
     and 'dba1e4018db64c32316818d23e5f4213766682ea'
---

0aa0fbd1d5ae7f6476129809f29ee3cda7e6a8ef