From: Philip Balister <philip@balister.org>
Date: Tue, 12 Feb 2008 13:42:34 +0000 (+0000)
Subject: merge of '967336334b2d3b22623c9851eb0ab8a2f5ad19c2'
X-Git-Tag: Release-2010-05/1~7704^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64efb6d640ada9fffcb4c98a1e4ae4f8d2bd0e9c;p=openembedded.git

Merge ... '967336334b2d3b22623c9851eb0ab8a2f5ad19c2'
     and 'f1ce41fae2ee4dc6bfc75fb8d991a37869ef24d8'
---

64efb6d640ada9fffcb4c98a1e4ae4f8d2bd0e9c