From: Philip Balister <philip@balister.org>
Date: Thu, 1 Mar 2007 00:28:15 +0000 (+0000)
Subject: merge of '3dcfaa6bfcd37701784ea312ab1d536ce3ee997e'
X-Git-Tag: Release-2010-05/1~9133^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=097534b3b0b8c172d9d07a2c2e7673508e389990;p=openembedded.git

Merge ... '3dcfaa6bfcd37701784ea312ab1d536ce3ee997e'
     and '5564f895f4ca7810ccc3f080e9b5f905f29dbdd3'
---

097534b3b0b8c172d9d07a2c2e7673508e389990