From: Philip Balister <philip@balister.org>
Date: Wed, 28 Feb 2007 13:25:20 +0000 (+0000)
Subject: merge of '13c300f63e70c7f9fa8bb5896db6f302da774262'
X-Git-Tag: Release-2010-05/1~9133^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=324f00fec5615a80ff0ce0d7950f4f32bc25f315;p=openembedded.git

Merge ... '13c300f63e70c7f9fa8bb5896db6f302da774262'
     and '7f4176e237bc030ef99353d2126c7cefa3375068'
---

324f00fec5615a80ff0ce0d7950f4f32bc25f315