From: Philip Balister <philip@balister.org>
Date: Thu, 15 May 2008 12:44:10 +0000 (+0000)
Subject: merge of '12863abb0b7e2930410ef9d63a38c9cebf57361b'
X-Git-Tag: Release-2010-05/1~6944^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99e670b20ff3b7f404da1ac2ec56b5821d067a5a;p=openembedded.git

Merge ... '12863abb0b7e2930410ef9d63a38c9cebf57361b'
     and 'cf37c9ac56f92be7950c19ff0574c6099086b9e6'
---

99e670b20ff3b7f404da1ac2ec56b5821d067a5a