From: Philip Balister <philip@balister.org>
Date: Thu, 1 Mar 2007 22:29:04 +0000 (+0000)
Subject: merge of '0aca530cedb795675036f35c32e9eca37a2c8985'
X-Git-Tag: Release-2010-05/1~9126
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aacbb6ba462d455f0b226c1ded6925ef163b2c3e;p=openembedded.git

Merge ... '0aca530cedb795675036f35c32e9eca37a2c8985'
     and '5ac21df7b1a77c051fd8fe1155e7a5539009e9af'
---

aacbb6ba462d455f0b226c1ded6925ef163b2c3e