From: Philip Balister <philip@balister.org>
Date: Tue, 16 Jan 2007 13:03:56 +0000 (+0000)
Subject: merge of '368dc50e87fa25338c003788d5a971d97ad9fd9a'
X-Git-Tag: Release-2010-05/1~9367
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9472733750eb8a156f9b890da173df8b2da8438;p=openembedded.git

Merge ... '368dc50e87fa25338c003788d5a971d97ad9fd9a'
     and 'd3cf8b2dc3f6eab1985f1d8b6243e5c4a52cb4bb'
---

f9472733750eb8a156f9b890da173df8b2da8438