From: Philip Balister <philip@balister.org>
Date: Wed, 28 Feb 2007 23:34:36 +0000 (+0000)
Subject: merge of '7d4cc29019d4d479c6301ca5482417150d83369f'
X-Git-Tag: Release-2010-05/1~9133^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ec1929e32c06ebb58da1bb404e687a201492fc;p=openembedded.git

Merge ... '7d4cc29019d4d479c6301ca5482417150d83369f'
     and '90c07393f116dc9720db1a55b78192aaa456e97d'
---

90ec1929e32c06ebb58da1bb404e687a201492fc