From: Philip Balister <philip@balister.org>
Date: Tue, 9 Jan 2007 16:55:20 +0000 (+0000)
Subject: merge of 'a353d9a082d436082c139102a0319641e531eaaf'
X-Git-Tag: Release-2010-05/1~9420^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=747d775316d2ad2df56511c5db30f73b9ac534f3;p=openembedded.git

Merge ... 'a353d9a082d436082c139102a0319641e531eaaf'
     and 'cd65725afb11c0f1959ea6a0ee3ad0749cf19ef9'
---

747d775316d2ad2df56511c5db30f73b9ac534f3